diff --git a/pps_ws/src/d_fall_pps/Student_GUI/studentGUI/MainWindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/MainWindow.cpp
similarity index 100%
rename from pps_ws/src/d_fall_pps/Student_GUI/studentGUI/MainWindow.cpp
rename to pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/MainWindow.cpp
diff --git a/pps_ws/src/d_fall_pps/Student_GUI/studentGUI/MainWindow.h b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/MainWindow.h
similarity index 100%
rename from pps_ws/src/d_fall_pps/Student_GUI/studentGUI/MainWindow.h
rename to pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/MainWindow.h
diff --git a/pps_ws/src/d_fall_pps/Student_GUI/studentGUI/MainWindow.ui b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/MainWindow.ui
similarity index 100%
rename from pps_ws/src/d_fall_pps/Student_GUI/studentGUI/MainWindow.ui
rename to pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/MainWindow.ui
diff --git a/pps_ws/src/d_fall_pps/Student_GUI/studentGUI/main.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/main.cpp
similarity index 100%
rename from pps_ws/src/d_fall_pps/Student_GUI/studentGUI/main.cpp
rename to pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/main.cpp
diff --git a/pps_ws/src/d_fall_pps/Student_GUI/studentGUI/studentGUI.pro b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro
similarity index 85%
rename from pps_ws/src/d_fall_pps/Student_GUI/studentGUI/studentGUI.pro
rename to pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro
index 0065b3413c2e797a9e3f0842d50d7a55a7ec2772..15f249d604baa955b6082afc111448a58cc928d6 100644
--- a/pps_ws/src/d_fall_pps/Student_GUI/studentGUI/studentGUI.pro
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro
@@ -1,6 +1,6 @@
 #-------------------------------------------------
 #
-# Project created by QtCreator 2017-08-17T17:25:39
+# Project created by QtCreator 2017-08-21T11:01:25
 #
 #-------------------------------------------------
 
diff --git a/pps_ws/src/d_fall_pps/Student_GUI/studentGUI/studentGUI.pro.user b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro.user
similarity index 97%
rename from pps_ws/src/d_fall_pps/Student_GUI/studentGUI/studentGUI.pro.user
rename to pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro.user
index a1f7ff35a1a891f45c3f8ace860287a3bd49d8cd..c12e645ab840d0541e3e3641c4f08f70ee348e6f 100644
--- a/pps_ws/src/d_fall_pps/Student_GUI/studentGUI/studentGUI.pro.user
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.2, 2017-08-17T18:14:21. -->
+<!-- Written by QtCreator 4.0.2, 2017-08-21T11:02:29. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -66,7 +66,7 @@
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/Student_GUI/build-studentGUI-Desktop_Qt_5_7_0_GCC_64bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/GUI_Qt/build-studentGUI-Desktop_Qt_5_7_0_GCC_64bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -126,7 +126,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/Student_GUI/build-studentGUI-Desktop_Qt_5_7_0_GCC_64bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/GUI_Qt/build-studentGUI-Desktop_Qt_5_7_0_GCC_64bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -186,7 +186,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/Student_GUI/build-studentGUI-Desktop_Qt_5_7_0_GCC_64bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/GUI_Qt/build-studentGUI-Desktop_Qt_5_7_0_GCC_64bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -304,13 +304,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">studentGUI</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/Student_GUI/studentGUI/studentGUI.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">studentGUI.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/Student_GUI/build-studentGUI-Desktop_Qt_5_7_0_GCC_64bit-Debug</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/gazebo-cf/work/D-FaLL-System/pps_ws/src/d_fall_pps/GUI_Qt/build-studentGUI-Desktop_Qt_5_7_0_GCC_64bit-Debug</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>