diff --git a/gui/obmc_gui/__init__.robot b/gui/__init__.robot
similarity index 100%
rename from gui/obmc_gui/__init__.robot
rename to gui/__init__.robot
diff --git a/gui/obmc_gui/data/resource_variables.py b/gui/data/resource_variables.py
similarity index 100%
rename from gui/obmc_gui/data/resource_variables.py
rename to gui/data/resource_variables.py
diff --git a/gui/data/variables.py b/gui/data/variables.py
deleted file mode 100644
index 65591d7..0000000
--- a/gui/data/variables.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/python
-
-# Contains xpaths and related string constants of Security scanning.
-
-
-class variables():
-
-    # xpaths for security scanning.
-
-    BROWSER = "ff"
-    nessus_logo = "xpath=//*[@id='logo']"
-    running_status = "xpath=//*[@id='main']/div[1]/section/div[2]/table/tbody/tr[1]/td[4]"
-    username = "test"
-    password = "passw0rd"
-    xpath_exception = "id=advancedButton"
-    xpath_add_exce = "id='exceptionDialogButton'"
-    xpath_uname = "xpath=//*[@id='nosession']/form/input[1]"
-    xpath_password = "xpath=//*[@id='nosession']/form/input[2]"
-    xpath_signin = "xpath=//*[@id='sign-in']"
-
-    xpath_search = "xpath=//*[@id='searchbox']/input"
-    scan_name = "OP Full Scan"
-    xpath_op_scan = "xpath=//*[@id='main']/div[1]/section/table/tbody"
-    xpath_launch = "xpath=//*[@id='scans-show-launch-dropdown']/span"
-    xpath_default = "xpath=//*[@id='scans-show-launch-default']"
-    xpath_status = "xpath=//*[@id='main']/div[1]/section/div[2]/table/tbody/tr[1]/td[4]"
diff --git a/gui/obmc_gui/lib/resource.robot b/gui/lib/resource.robot
similarity index 97%
rename from gui/obmc_gui/lib/resource.robot
rename to gui/lib/resource.robot
index 754e74a..00a410f 100644
--- a/gui/obmc_gui/lib/resource.robot
+++ b/gui/lib/resource.robot
@@ -12,14 +12,14 @@
 Library      SSHLibrary  30 Seconds
 Library      Process
 Library      supporting_libs.py
-Library      ../../../lib/gen_print.py
-Library      ../../../lib/gen_robot_print.py
-Library      ../../../lib/gen_valid.py
-Library      ../../../lib/gen_robot_ssh.py
-Library      ../../../lib/bmc_ssh_utils.py
-Resource     ../../../lib/resource.txt
-Resource     ../../../lib/rest_client.robot
-Resource     ../../../lib/state_manager.robot
+Library      ../../lib/gen_print.py
+Library      ../../lib/gen_robot_print.py
+Library      ../../lib/gen_valid.py
+Library      ../../lib/gen_robot_ssh.py
+Library      ../../lib/bmc_ssh_utils.py
+Resource     ../../lib/resource.txt
+Resource     ../../lib/rest_client.robot
+Resource     ../../lib/state_manager.robot
 Variables    ../data/resource_variables.py
 
 *** Variables ***
diff --git a/gui/lib/resource.txt b/gui/lib/resource.txt
deleted file mode 100644
index c9c8224..0000000
--- a/gui/lib/resource.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Settings ***
-Library  OperatingSystem
-Variables  ../data/variables.py
-
-*** Variables ***
-${HOST}           ${EMPTY}
-${HOST_USERNAME}  ${EMPTY}
-${HOST_PASSWORD}  ${EMPTY}
diff --git a/gui/obmc_gui/lib/supporting_libs.py b/gui/lib/supporting_libs.py
similarity index 100%
rename from gui/obmc_gui/lib/supporting_libs.py
rename to gui/lib/supporting_libs.py
diff --git a/gui/lib/utils.robot b/gui/lib/utils.robot
deleted file mode 100644
index c21cf40..0000000
--- a/gui/lib/utils.robot
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Settings ***
-
-Library  XvfbRobot
-Library  OperatingSystem
-Library  Selenium2Library  120  120
-Library  Telnet  30 Seconds
-Library  Screenshot
-
-Resource  resource.txt
-
-*** Keywords ***
-
-Open Browser With URL
-    [Documentation]  Opens browser with specified URL.
-    [Arguments]  ${URL}
-    Start Virtual Display  1920  1080
-    ${browser_ID}=  Open Browser  ${URL}
-    Set Window Size  1920  1080
-    [Return]  browser_ID
-
-Break Firewall
-    [Documentation]  Break firewall.
-    [Arguments]  ${HOST}  ${HOST_USERNAME}  ${HOST_PASSWORD}
-    ${status}  ${value}=  Run Keyword And Ignore Error  Telnet.Open Connection
-    ...         ${HOST}  prompt=#
-    Run Keyword If  '${status}'=='PASS'  Telnet.Login  ${HOST_USERNAME}
-    ...  ${HOST_PASSWORD}  login_prompt=Username:  password_prompt=Password:
-
-Login To GUI
-    [Documentation]  Log into web GUI.
-    [Arguments]  ${URL}  ${xpath_uname}  ${username}
-    ...  ${xpath_password}  ${password}  ${xpath_signin}  ${logo}
-    Go To  ${URL}
-    Input Text  ${xpath_uname}  ${username}
-    Input Password  ${xpath_password}  ${password}
-    Click Button  ${xpath_signin}
-    Wait Until Page Contains Element  ${logo}
diff --git a/gui/obmc_gui/test/gui_header/test_obmc_gui_ip_refresh_check.robot b/gui/test/gui_header/test_obmc_gui_ip_refresh_check.robot
similarity index 100%
rename from gui/obmc_gui/test/gui_header/test_obmc_gui_ip_refresh_check.robot
rename to gui/test/gui_header/test_obmc_gui_ip_refresh_check.robot
diff --git a/gui/obmc_gui/test/gui_header/test_obmc_gui_power_operations.robot b/gui/test/gui_header/test_obmc_gui_power_operations.robot
similarity index 98%
rename from gui/obmc_gui/test/gui_header/test_obmc_gui_power_operations.robot
rename to gui/test/gui_header/test_obmc_gui_power_operations.robot
index 5741224..56bd9c6 100644
--- a/gui/obmc_gui/test/gui_header/test_obmc_gui_power_operations.robot
+++ b/gui/test/gui_header/test_obmc_gui_power_operations.robot
@@ -2,7 +2,7 @@
 
 Documentation  Test Open BMC GUI Power Operations under GUI Header.
 
-Resource  ../../../../lib/state_manager.robot
+Resource  ../../../lib/state_manager.robot
 Resource  ../../lib/resource.robot
 
 Test Setup      Test Setup Execution
diff --git a/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot b/gui/test/gui_header/test_obmc_gui_server_health.robot
similarity index 96%
rename from gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
rename to gui/test/gui_header/test_obmc_gui_server_health.robot
index fd79065..88fdd69 100644
--- a/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
+++ b/gui/test/gui_header/test_obmc_gui_server_health.robot
@@ -3,14 +3,14 @@
 Documentation  Test Open BMC GUI server health under GUI Header.
 
 Resource        ../../lib/resource.robot
-Resource        ../../../../lib/boot_utils.robot
-Resource        ../../../../lib/utils.robot
-Resource        ../../../../lib/openbmc_ffdc.robot
-Resource        ../../../../lib/state_manager.robot
-Resource        ../../../../lib/openbmc_ffdc_methods.robot
-Resource        ../../../../lib/dump_utils.robot
-Resource        ../../../../lib/logging_utils.robot
-Library         ../../../../lib/gen_robot_keyword.py
+Resource        ../../../lib/boot_utils.robot
+Resource        ../../../lib/utils.robot
+Resource        ../../../lib/openbmc_ffdc.robot
+Resource        ../../../lib/state_manager.robot
+Resource        ../../../lib/openbmc_ffdc_methods.robot
+Resource        ../../../lib/dump_utils.robot
+Resource        ../../../lib/logging_utils.robot
+Library         ../../../lib/gen_robot_keyword.py
 
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
diff --git a/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot b/gui/test/server_config/test_obmc_gui_firmware_update.robot
similarity index 98%
rename from gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot
rename to gui/test/server_config/test_obmc_gui_firmware_update.robot
index 7b4dfb1..528d35e 100644
--- a/gui/obmc_gui/test/server_config/test_obmc_gui_firmware_update.robot
+++ b/gui/test/server_config/test_obmc_gui_firmware_update.robot
@@ -3,7 +3,7 @@
 Documentation  Test Open BMC GUI server configuration firmware update.
 
 Resource        ../../lib/resource.robot
-Resource        ../../../../lib/logging_utils.robot
+Resource        ../../../lib/logging_utils.robot
 
 Suite Setup     Launch Browser And Login OpenBMC GUI
 Suite Teardown  Close Browser
diff --git a/gui/obmc_gui/test/server_config/test_obmc_gui_network_settings.robot b/gui/test/server_config/test_obmc_gui_network_settings.robot
similarity index 100%
rename from gui/obmc_gui/test/server_config/test_obmc_gui_network_settings.robot
rename to gui/test/server_config/test_obmc_gui_network_settings.robot
diff --git a/gui/obmc_gui/test/server_control/test_obmc_gui_server_power_operations.robot b/gui/test/server_control/test_obmc_gui_server_power_operations.robot
similarity index 100%
rename from gui/obmc_gui/test/server_control/test_obmc_gui_server_power_operations.robot
rename to gui/test/server_control/test_obmc_gui_server_power_operations.robot
diff --git a/gui/obmc_gui/test/server_health/test_obmc_gui_hardware_status.robot b/gui/test/server_health/test_obmc_gui_hardware_status.robot
similarity index 100%
rename from gui/obmc_gui/test/server_health/test_obmc_gui_hardware_status.robot
rename to gui/test/server_health/test_obmc_gui_hardware_status.robot
diff --git a/gui/obmc_gui/test/server_health/test_obmc_gui_sensors.robot b/gui/test/server_health/test_obmc_gui_sensors.robot
similarity index 100%
rename from gui/obmc_gui/test/server_health/test_obmc_gui_sensors.robot
rename to gui/test/server_health/test_obmc_gui_sensors.robot
diff --git a/gui/obmc_gui/test/server_overview/test_obmc_gui_server_overview.robot b/gui/test/server_overview/test_obmc_gui_server_overview.robot
similarity index 100%
rename from gui/obmc_gui/test/server_overview/test_obmc_gui_server_overview.robot
rename to gui/test/server_overview/test_obmc_gui_server_overview.robot
diff --git a/gui/obmc_gui/test/users/test_obmc_gui_manage_user.robot b/gui/test/users/test_obmc_gui_manage_user.robot
similarity index 100%
rename from gui/obmc_gui/test/users/test_obmc_gui_manage_user.robot
rename to gui/test/users/test_obmc_gui_manage_user.robot
diff --git a/gui/tests/test_security_scanning.robot b/gui/tests/test_security_scanning.robot
deleted file mode 100644
index 91211d7..0000000
--- a/gui/tests/test_security_scanning.robot
+++ /dev/null
@@ -1,47 +0,0 @@
-*** Settings ***
-
-Documentation  Run security and vulnerability scan.
-
-Library  XML
-Library  String
-Library  Collections
-Library  DateTime
-
-Test Setup  Security Setup
-
-Resource  ../lib/utils.robot
-
-*** Test Cases ***
-
-Security Scan
-    [Documentation]  Run nessus network and vulnerability scan.
-    [Tags]  Security_Scan
-    Log  ${NESSUS_URL}
-    Open Browser with URL  ${NESSUS_URL}
-    Login to GUI  ${NESSUS_URL}  ${xpath_uname}  ${username}
-    ...  ${xpath_password}  ${password}  ${xpath_signin}  ${nessus_logo}
-    Select Full Scan
-    Start Scan
-
-*** Keywords ***
-
-Security Setup
-    [Documentation]  Break firewall and generate URL.
-    # Nessus Username, password and IP details are expected by program
-    # and should be given as command line parameters.
-    Break Firewall  ${NESSUS_HOST}  ${NESSUS_USERNAME}  ${NESSUS_PASSWORD}
-    ${NESSUS_URL}=  Set Variable  https://${NESSUS_HOST}:8834/nessus6.html
-    Set Suite Variable  ${NESSUS_URL}
-
-Select Full Scan
-    [Documentation]  Search OP full scan.
-    Input Text  ${xpath_search}  ${scan_name}
-    Capture Page Screenshot
-    Click Element  ${xpath_op_scan}
-
-Start Scan
-    [Documentation]  Start Nessus scan.
-    Click Element  ${xpath_launch}
-    Click Element  ${xpath_default}
-    Wait Until Page Contains  running  error=Scanning not started.
-    Capture Page Screenshot