diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/SystemConfigGUI.pro b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.pro
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/SystemConfigGUI.pro
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.pro
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/SystemConfigGUI.qrc b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.qrc
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/SystemConfigGUI.qrc
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.qrc
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/forms/mainguiwindow.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/forms/mainguiwindow.ui
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/forms/mainguiwindow.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/forms/mainguiwindow.ui
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/center_rect.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/center_rect.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/center_rect.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/center_rect.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone.png b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone.png
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone.png
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_01.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_01.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_01.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_01.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_02.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_02.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_02.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_02.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_03.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_03.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_03.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_03.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_04.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_04.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_04.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_04.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_05.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_05.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_05.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_05.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_06.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_06.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_06.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_06.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_07.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_07.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_07.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_07.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_08.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_08.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_08.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_08.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_09.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_09.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_09.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_09.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_unk.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_unk.svg
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_unk.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/images/drone_fixed_unk.svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/CFLinker.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/CFLinker.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/CFLinker.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/CFLinker.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/centerMarker.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/centerMarker.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/centerMarker.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/centerMarker.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/channelLUT.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/channelLUT.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/channelLUT.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/constants_for_qt_compile.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/constants_for_qt_compile.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/constants_for_qt_compile.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/constants_for_qt_compile.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/cornergrabber.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/cornergrabber.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFly.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/crazyFly.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFly.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/crazyFly.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/crazyFlyZone.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/crazyFlyZone.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/crazyFlyZoneTab.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/crazyFlyZoneTab.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/globalDefinitions.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/globalDefinitions.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/marker.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/marker.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/myGraphicsRectItem.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/myGraphicsRectItem.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/myGraphicsScene.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/myGraphicsScene.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/myGraphicsView.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/myGraphicsView.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_systemConfigGUI.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/rosNodeThread_for_systemConfigGUI.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_systemConfigGUI.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/rosNodeThread_for_systemConfigGUI.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/tablePiece.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/tablePiece.h
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/tablePiece.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/tablePiece.h
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/CFLinker.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/CFLinker.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/centerMarker.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/centerMarker.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/channelLUT.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/channelLUT.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/cornergrabber.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/cornergrabber.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/crazyFly.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/crazyFly.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/crazyFlyZone.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/crazyFlyZone.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/crazyFlyZoneTab.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/crazyFlyZoneTab.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/main.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/main.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/marker.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/marker.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/myGraphicsRectItem.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/myGraphicsRectItem.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/myGraphicsScene.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/myGraphicsScene.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/myGraphicsView.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/myGraphicsView.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_systemConfigGUI.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/rosNodeThread_for_systemConfigGUI.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_systemConfigGUI.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/rosNodeThread_for_systemConfigGUI.cpp
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/tablePiece.cpp
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/tablePiece.cpp