diff --git a/gui/gui_test/health_menu/test_hardware_status_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
similarity index 100%
rename from gui/gui_test/health_menu/test_hardware_status_sub_menu.robot
rename to gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
diff --git a/gui/gui_test/health_menu/test_sensors_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
similarity index 100%
rename from gui/gui_test/health_menu/test_sensors_sub_menu.robot
rename to gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
diff --git a/gui/gui_test/health_menu/test_dumps_sub_menu.robot b/gui/gui_test/logs_menu/test_dumps_sub_menu.robot
similarity index 100%
rename from gui/gui_test/health_menu/test_dumps_sub_menu.robot
rename to gui/gui_test/logs_menu/test_dumps_sub_menu.robot
diff --git a/gui/gui_test/health_menu/test_event_logs_sub_menu.robot b/gui/gui_test/logs_menu/test_event_logs_sub_menu.robot
similarity index 100%
rename from gui/gui_test/health_menu/test_event_logs_sub_menu.robot
rename to gui/gui_test/logs_menu/test_event_logs_sub_menu.robot
diff --git a/gui/gui_test/control_menu/test_factory_reset_sub_menu.robot b/gui/gui_test/operations_menu/test_factory_reset_sub_menu.robot
similarity index 100%
rename from gui/gui_test/control_menu/test_factory_reset_sub_menu.robot
rename to gui/gui_test/operations_menu/test_factory_reset_sub_menu.robot
diff --git a/gui/gui_test/configuration_menu/test_firmware_sub_menu.robot b/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
similarity index 100%
rename from gui/gui_test/configuration_menu/test_firmware_sub_menu.robot
rename to gui/gui_test/operations_menu/test_firmware_sub_menu.robot
diff --git a/gui/gui_test/control_menu/test_reboot_bmc_sub_menu.robot b/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
similarity index 100%
rename from gui/gui_test/control_menu/test_reboot_bmc_sub_menu.robot
rename to gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
diff --git a/gui/gui_test/control_menu/test_server_power_operations_sub_menu.robot b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
similarity index 100%
rename from gui/gui_test/control_menu/test_server_power_operations_sub_menu.robot
rename to gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
diff --git a/gui/gui_test/control_menu/test_sol_console_sub_menu.robot b/gui/gui_test/operations_menu/test_sol_console_sub_menu.robot
similarity index 100%
rename from gui/gui_test/control_menu/test_sol_console_sub_menu.robot
rename to gui/gui_test/operations_menu/test_sol_console_sub_menu.robot
diff --git a/gui/gui_test/control_menu/test_manage_power_usage_sub_menu.robot b/gui/gui_test/resource_management_menu/test_power_sub_menu.robot
similarity index 100%
rename from gui/gui_test/control_menu/test_manage_power_usage_sub_menu.robot
rename to gui/gui_test/resource_management_menu/test_power_sub_menu.robot
diff --git a/gui/gui_test/access_control_menu/test_ssl_certificates_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
similarity index 100%
rename from gui/gui_test/access_control_menu/test_ssl_certificates_sub_menu.robot
rename to gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
diff --git a/gui/gui_test/access_control_menu/test_ldap_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
similarity index 100%
rename from gui/gui_test/access_control_menu/test_ldap_sub_menu.robot
rename to gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
diff --git a/gui/gui_test/configuration_menu/test_multiple_interfaces.robot b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
similarity index 100%
rename from gui/gui_test/configuration_menu/test_multiple_interfaces.robot
rename to gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
diff --git a/gui/gui_test/server_config/test_security_settings.robot b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
similarity index 100%
rename from gui/gui_test/server_config/test_security_settings.robot
rename to gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
diff --git a/gui/gui_test/access_control_menu/test_client_sessions_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
similarity index 100%
rename from gui/gui_test/access_control_menu/test_client_sessions_sub_menu.robot
rename to gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
diff --git a/gui/gui_test/access_control_menu/test_local_user_management_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
similarity index 100%
rename from gui/gui_test/access_control_menu/test_local_user_management_sub_menu.robot
rename to gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
diff --git a/gui/gui_test/configuration_menu/test_date_time_settings_sub_menu.robot b/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
similarity index 100%
rename from gui/gui_test/configuration_menu/test_date_time_settings_sub_menu.robot
rename to gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
diff --git a/gui/gui_test/configuration_menu/test_network_settings_sub_menu.robot b/gui/gui_test/settings_menu/test_network_sub_menu.robot
similarity index 100%
rename from gui/gui_test/configuration_menu/test_network_settings_sub_menu.robot
rename to gui/gui_test/settings_menu/test_network_sub_menu.robot
diff --git a/gui/gui_test/control_menu/test_power_restore_policy_sub_menu.robot b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
similarity index 100%
rename from gui/gui_test/control_menu/test_power_restore_policy_sub_menu.robot
rename to gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot