diff --git a/.gitignore b/.gitignore
index 2680693895de41156bd239b2108226819e9b592d..54bbb139f7ddb0d72a14b276157237799dae2d15 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 dfall_ws/build/
 dfall_ws/devel/
 
-dfall_ws/src/d_fall_pps/lib/vicon/
-dfall_ws/src/d_fall_pps/include/DataStreamClient.h
+dfall_ws/src/dfall_pkg/lib/vicon/
+dfall_ws/src/dfall_pkg/include/DataStreamClient.h
 
 # Qt Project files with user preferences
 *.pro.user
diff --git a/dfall_ws/src/d_fall_pps/CMakeLists.txt b/dfall_ws/src/dfall_pkg/CMakeLists.txt
similarity index 100%
rename from dfall_ws/src/d_fall_pps/CMakeLists.txt
rename to dfall_ws/src/dfall_pkg/CMakeLists.txt
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/center_rect.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/center_rect.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/center_rect.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/center_rect.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone.png b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_01.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_01.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_01.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_01.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_02.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_02.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_02.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_02.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_03.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_03.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_03.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_03.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_04.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_04.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_04.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_04.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_05.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_05.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_05.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_05.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_06.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_06.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_06.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_06.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_07.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_07.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_07.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_07.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_08.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_08.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_08.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_08.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_09.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_09.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_09.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_09.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_unk.svg b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_unk.svg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/images/drone_fixed_unk.svg
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/images/drone_fixed_unk.svg
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/CFLinker.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/CFLinker.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/CFLinker.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/CFLinker.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/centerMarker.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/centerMarker.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/channelLUT.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFly.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFly.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFly.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFly.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/marker.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/marker.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/marker.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/marker.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_managerGUI.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_managerGUI.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_managerGUI.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_managerGUI.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/tablePiece.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/tablePiece.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/tablePiece.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/tablePiece.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/main.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/main.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/main.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/main.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/marker.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/marker.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/marker.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/marker.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/coordinator.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/coordinator.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/coordinator.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/coordinator.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/coordinatorrow.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/coordinatorrow.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/coordinatorrow.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/coordinatorrow.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/safecontrollertab.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/safecontrollertab.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/safecontrollertab.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/safecontrollertab.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/studentcontrollertab.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/topbanner.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/topbanner.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/topbanner.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/topbanner.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/tuningcontrollertab.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/tuningcontrollertab.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/tuningcontrollertab.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/tuningcontrollertab.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_20.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_20.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_20.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_20.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_40.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_40.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_40.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_40.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_60.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_60.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_60.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_60.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_80.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_80.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_80.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_80.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_empty.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_empty.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_empty.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_empty.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_full.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_full.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_full.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_full.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_unavailable.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_unavailable.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_unavailable.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_unavailable.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_unknown.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_unknown.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/battery_unknown.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/battery_unknown.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/emergency_stop.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/emergency_stop.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/emergency_stop.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/emergency_stop.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_disabling.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_disabling.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_disabling.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_disabling.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_enabling.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_enabling.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_enabling.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_enabling.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_flying.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_flying.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_flying.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_flying.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_off.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_off.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_off.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_off.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_unavailable.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_unavailable.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_unavailable.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_unavailable.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_unknown.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_unknown.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/flying_state_unknown.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/flying_state_unknown.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/rf_connected.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/rf_connected.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/rf_connected.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/rf_connected.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/rf_connecting.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/rf_connecting.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/rf_connecting.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/rf_connecting.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/rf_disconnected.png b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/rf_disconnected.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/images/rf_disconnected.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/images/rf_disconnected.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/Constants_for_Qt_compile.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/Constants_for_Qt_compile.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/Constants_for_Qt_compile.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/Constants_for_Qt_compile.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/PickerControllerConstants_for_Qt_compile.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/PickerControllerConstants_for_Qt_compile.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/PickerControllerConstants_for_Qt_compile.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/PickerControllerConstants_for_Qt_compile.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/connectstartstopbar.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/connectstartstopbar.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/connectstartstopbar.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/connectstartstopbar.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/controllertabs.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/controllertabs.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/controllertabs.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/controllertabs.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/coordinator.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/coordinator.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/coordinator.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/coordinator.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/coordinatorrow.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/coordinatorrow.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/coordinatorrow.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/coordinatorrow.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/enablecontrollerloadyamlbar.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/enablecontrollerloadyamlbar.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/enablecontrollerloadyamlbar.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/enablecontrollerloadyamlbar.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/mainwindow.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/mainwindow.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/mainwindow.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/mainwindow.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/pickercontrollertab.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/pickercontrollertab.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/pickercontrollertab.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/pickercontrollertab.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/rosNodeThread_for_flyingAgentGUI.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/rosNodeThread_for_flyingAgentGUI.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/rosNodeThread_for_flyingAgentGUI.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/rosNodeThread_for_flyingAgentGUI.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/safecontrollertab.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/safecontrollertab.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/safecontrollertab.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/safecontrollertab.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/studentcontrollertab.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/studentcontrollertab.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/studentcontrollertab.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/studentcontrollertab.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/topbanner.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/topbanner.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/topbanner.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/topbanner.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/tuningcontrollertab.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/tuningcontrollertab.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/tuningcontrollertab.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/tuningcontrollertab.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/connectstartstopbar.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/coordinator.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/coordinator.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/coordinator.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/coordinator.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/coordinatorrow.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/enablecontrollerloadyamlbar.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/enablecontrollerloadyamlbar.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/enablecontrollerloadyamlbar.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/enablecontrollerloadyamlbar.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/main.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/main.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/main.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/main.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/pickercontrollertab.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/pickercontrollertab.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/pickercontrollertab.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/pickercontrollertab.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/rosNodeThread_for_flyingAgentGUI.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/rosNodeThread_for_flyingAgentGUI.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/rosNodeThread_for_flyingAgentGUI.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/rosNodeThread_for_flyingAgentGUI.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/safecontrollertab.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/safecontrollertab.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/safecontrollertab.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/safecontrollertab.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/studentcontrollertab.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/studentcontrollertab.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/studentcontrollertab.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/studentcontrollertab.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/topbanner.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/topbanner.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/tuningcontrollertab.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/tuningcontrollertab.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/tuningcontrollertab.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/tuningcontrollertab.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_20.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_20.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_20.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_20.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_40.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_40.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_40.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_40.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_60.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_60.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_60.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_60.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_80.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_80.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_80.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_80.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_empty.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_empty.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_empty.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_empty.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_full.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_full.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_full.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_full.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_unknown.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_unknown.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/battery_unknown.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/battery_unknown.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_disabling.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_disabling.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_disabling.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_disabling.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_enabling.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_enabling.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_enabling.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_enabling.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_flying.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_flying.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_flying.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_flying.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_off.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_off.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_off.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_off.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_unknown.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_unknown.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/flying_state_unknown.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/flying_state_unknown.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/rf_connected.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/rf_connected.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/rf_connected.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/rf_connected.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/rf_connecting.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/rf_connecting.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/rf_connecting.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/rf_connecting.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/rf_disconnected.png b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/rf_disconnected.png
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/images/rf_disconnected.png
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/images/rf_disconnected.png
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/include/MainWindow.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/include/MainWindow.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread_for_studentGUI.h b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/include/rosNodeThread_for_studentGUI.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread_for_studentGUI.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/include/rosNodeThread_for_studentGUI.h
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/src/MainWindow.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/src/MainWindow.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/src/MainWindow.ui
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/src/MainWindow.ui
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/src/main.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/src/main.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread_for_studentGUI.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/src/rosNodeThread_for_studentGUI.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread_for_studentGUI.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/src/rosNodeThread_for_studentGUI.cpp
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/studentGUI.pro
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/studentGUI.pro
diff --git a/dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentgui.qrc b/dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/studentgui.qrc
similarity index 100%
rename from dfall_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentgui.qrc
rename to dfall_ws/src/dfall_pkg/GUI_Qt/studentGUI/studentgui.qrc
diff --git a/dfall_ws/src/d_fall_pps/PPS.perspective b/dfall_ws/src/dfall_pkg/PPS.perspective
similarity index 100%
rename from dfall_ws/src/d_fall_pps/PPS.perspective
rename to dfall_ws/src/dfall_pkg/PPS.perspective
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/CrazyRadio.py b/dfall_ws/src/dfall_pkg/crazyradio/CrazyRadio.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/CrazyRadio.py
rename to dfall_ws/src/dfall_pkg/crazyradio/CrazyRadio.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/LICENSE.txt b/dfall_ws/src/dfall_pkg/crazyradio/LICENSE.txt
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/LICENSE.txt
rename to dfall_ws/src/dfall_pkg/crazyradio/LICENSE.txt
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/Makefile b/dfall_ws/src/dfall_pkg/crazyradio/Makefile
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/Makefile
rename to dfall_ws/src/dfall_pkg/crazyradio/Makefile
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/README.md b/dfall_ws/src/dfall_pkg/crazyradio/README.md
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/README.md
rename to dfall_ws/src/dfall_pkg/crazyradio/README.md
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/TestCF.py b/dfall_ws/src/dfall_pkg/crazyradio/TestCF.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/TestCF.py
rename to dfall_ws/src/dfall_pkg/crazyradio/TestCF.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/bootloader/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/bootloader/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/bootloader/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/bootloader/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/bootloader/boottypes.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/bootloader/boottypes.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/bootloader/boottypes.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/bootloader/boottypes.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/bootloader/cloader.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/bootloader/cloader.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/bootloader/cloader.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/bootloader/cloader.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/commander.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/commander.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/commander.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/commander.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/console.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/console.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/console.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/console.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/extpos.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/extpos.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/extpos.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/extpos.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/localization.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/localization.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/localization.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/localization.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/log.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/log.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/log.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/log.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/mem.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/mem.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/mem.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/mem.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/param.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/param.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/param.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/param.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/platformservice.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/platformservice.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/platformservice.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/platformservice.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/swarm.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/swarm.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/swarm.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/swarm.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/syncCrazyflie.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/syncCrazyflie.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/syncCrazyflie.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/syncCrazyflie.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/syncLogger.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/syncLogger.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/syncLogger.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/syncLogger.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/toc.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/toc.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/toc.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/toc.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/toccache.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/toccache.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crazyflie/toccache.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crazyflie/toccache.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/crtpdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/crtpdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/crtpdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/crtpdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/crtpstack.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/crtpstack.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/crtpstack.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/crtpstack.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/debugdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/debugdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/debugdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/debugdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/exceptions.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/exceptions.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/exceptions.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/exceptions.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/radiodriver.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/radiodriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/radiodriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/radiodriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/serialdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/serialdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/serialdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/serialdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/udpdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/udpdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/udpdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/udpdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/usbdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/usbdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/crtp/usbdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/crtp/usbdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/drivers/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/drivers/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/drivers/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/drivers/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/drivers/cfusb.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/drivers/cfusb.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/drivers/cfusb.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/drivers/cfusb.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/drivers/crazyradio.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/drivers/crazyradio.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/drivers/crazyradio.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/drivers/crazyradio.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/utils/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/utils/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/utils/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/utils/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/utils/callbacks.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/utils/callbacks.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/cflib/utils/callbacks.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/cflib/utils/callbacks.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/lpslib/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/lpslib/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/lpslib/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/lpslib/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/lpslib/lopoanchor.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/lpslib/lopoanchor.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/lpslib/lopoanchor.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/lpslib/lopoanchor.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crazyflie/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crazyflie/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crazyflie/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crazyflie/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crazyflie/test_swarm.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crazyflie/test_swarm.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crazyflie/test_swarm.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crazyflie/test_swarm.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crazyflie/test_syncCrazyflie.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crazyflie/test_syncCrazyflie.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crazyflie/test_syncCrazyflie.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crazyflie/test_syncCrazyflie.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crazyflie/test_syncLogger.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crazyflie/test_syncLogger.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crazyflie/test_syncLogger.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crazyflie/test_syncLogger.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crtp/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crtp/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crtp/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crtp/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crtp/test_crtpstack.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crtp/test_crtpstack.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/crtp/test_crtpstack.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/crtp/test_crtpstack.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/support/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/support/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/support/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/support/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/support/asyncCallbackCaller.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/support/asyncCallbackCaller.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/support/asyncCallbackCaller.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/support/asyncCallbackCaller.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/utils/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/utils/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/utils/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/utils/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/utils/test_callbacks.py b/dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/utils/test_callbacks.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/build/lib/test/utils/test_callbacks.py
rename to dfall_ws/src/dfall_pkg/crazyradio/build/lib/test/utils/test_callbacks.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/PKG-INFO b/dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/PKG-INFO
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/PKG-INFO
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/PKG-INFO
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/SOURCES.txt b/dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/SOURCES.txt
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/SOURCES.txt
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/SOURCES.txt
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/dependency_links.txt b/dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/dependency_links.txt
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/dependency_links.txt
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/dependency_links.txt
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/requires.txt b/dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/requires.txt
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/requires.txt
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/requires.txt
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/top_level.txt b/dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/top_level.txt
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib.egg-info/top_level.txt
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib.egg-info/top_level.txt
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/bootloader/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/bootloader/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/bootloader/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/bootloader/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/bootloader/boottypes.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/bootloader/boottypes.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/bootloader/boottypes.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/bootloader/boottypes.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/bootloader/cloader.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/bootloader/cloader.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/bootloader/cloader.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/bootloader/cloader.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/commander.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/commander.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/commander.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/commander.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/console.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/console.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/console.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/console.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/extpos.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/extpos.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/extpos.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/extpos.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/localization.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/localization.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/localization.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/localization.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/log.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/log.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/log.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/log.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/mem.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/mem.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/mem.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/mem.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/param.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/param.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/param.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/param.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/platformservice.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/platformservice.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/platformservice.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/platformservice.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/swarm.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/swarm.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/swarm.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/swarm.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/syncCrazyflie.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/syncCrazyflie.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/syncCrazyflie.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/syncCrazyflie.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/syncLogger.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/syncLogger.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/syncLogger.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/syncLogger.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toc.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/toc.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toc.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/toc.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toccache.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/toccache.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toccache.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crazyflie/toccache.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/crtpdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/crtpdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpstack.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/crtpstack.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpstack.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/crtpstack.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/debugdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/debugdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/debugdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/debugdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/exceptions.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/exceptions.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/exceptions.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/exceptions.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/radiodriver.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/radiodriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/radiodriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/radiodriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/serialdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/serialdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/serialdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/serialdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/udpdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/udpdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/udpdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/udpdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/usbdriver.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/usbdriver.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/crtp/usbdriver.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/crtp/usbdriver.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/drivers/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/drivers/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/drivers/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/drivers/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/drivers/cfusb.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/drivers/cfusb.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/drivers/cfusb.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/drivers/cfusb.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/drivers/crazyradio.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/drivers/crazyradio.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/drivers/crazyradio.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/drivers/crazyradio.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/utils/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/utils/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/utils/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/utils/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/cflib/utils/callbacks.py b/dfall_ws/src/dfall_pkg/crazyradio/cflib/utils/callbacks.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/cflib/utils/callbacks.py
rename to dfall_ws/src/dfall_pkg/crazyradio/cflib/utils/callbacks.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/dist/cflib-0.1.3-py3.5.egg b/dfall_ws/src/dfall_pkg/crazyradio/dist/cflib-0.1.3-py3.5.egg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/dist/cflib-0.1.3-py3.5.egg
rename to dfall_ws/src/dfall_pkg/crazyradio/dist/cflib-0.1.3-py3.5.egg
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/autonomousSequence.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/autonomousSequence.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/autonomousSequence.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/autonomousSequence.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/basiclog.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/basiclog.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/basiclog.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/basiclog.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/basiclogSync.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/basiclogSync.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/basiclogSync.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/basiclogSync.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/basicparam.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/basicparam.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/basicparam.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/basicparam.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/erase-ow.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/erase-ow.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/erase-ow.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/erase-ow.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/flash-memory.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/flash-memory.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/flash-memory.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/flash-memory.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/flowsequenceSync.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/flowsequenceSync.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/flowsequenceSync.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/flowsequenceSync.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/lps_reboot_to_bootloader.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/lps_reboot_to_bootloader.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/lps_reboot_to_bootloader.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/lps_reboot_to_bootloader.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/multiramp.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/multiramp.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/multiramp.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/multiramp.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/radio-test.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/radio-test.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/radio-test.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/radio-test.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/ramp.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/ramp.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/ramp.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/ramp.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/read-eeprom.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/read-eeprom.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/read-eeprom.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/read-eeprom.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/read-ow.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/read-ow.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/read-ow.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/read-ow.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/scan.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/scan.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/scan.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/scan.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/swarmSequence.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/swarmSequence.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/swarmSequence.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/swarmSequence.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/swarmSequenceCircle.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/swarmSequenceCircle.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/swarmSequenceCircle.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/swarmSequenceCircle.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/write-eeprom.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/write-eeprom.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/write-eeprom.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/write-eeprom.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/examples/write-ow.py b/dfall_ws/src/dfall_pkg/crazyradio/examples/write-ow.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/examples/write-ow.py
rename to dfall_ws/src/dfall_pkg/crazyradio/examples/write-ow.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/lpslib/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/lpslib/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/lpslib/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/lpslib/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/lpslib/lopoanchor.py b/dfall_ws/src/dfall_pkg/crazyradio/lpslib/lopoanchor.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/lpslib/lopoanchor.py
rename to dfall_ws/src/dfall_pkg/crazyradio/lpslib/lopoanchor.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/module.json b/dfall_ws/src/dfall_pkg/crazyradio/module.json
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/module.json
rename to dfall_ws/src/dfall_pkg/crazyradio/module.json
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/requirements-dev.txt b/dfall_ws/src/dfall_pkg/crazyradio/requirements-dev.txt
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/requirements-dev.txt
rename to dfall_ws/src/dfall_pkg/crazyradio/requirements-dev.txt
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/requirements.txt b/dfall_ws/src/dfall_pkg/crazyradio/requirements.txt
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/requirements.txt
rename to dfall_ws/src/dfall_pkg/crazyradio/requirements.txt
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/setup.cfg b/dfall_ws/src/dfall_pkg/crazyradio/setup.cfg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/setup.cfg
rename to dfall_ws/src/dfall_pkg/crazyradio/setup.cfg
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/setup.py b/dfall_ws/src/dfall_pkg/crazyradio/setup.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/setup.py
rename to dfall_ws/src/dfall_pkg/crazyradio/setup.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/setup_linux.sh b/dfall_ws/src/dfall_pkg/crazyradio/setup_linux.sh
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/setup_linux.sh
rename to dfall_ws/src/dfall_pkg/crazyradio/setup_linux.sh
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/test/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/crazyflie/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/test/crazyflie/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/crazyflie/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/crazyflie/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/crazyflie/test_swarm.py b/dfall_ws/src/dfall_pkg/crazyradio/test/crazyflie/test_swarm.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/crazyflie/test_swarm.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/crazyflie/test_swarm.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/crazyflie/test_syncCrazyflie.py b/dfall_ws/src/dfall_pkg/crazyradio/test/crazyflie/test_syncCrazyflie.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/crazyflie/test_syncCrazyflie.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/crazyflie/test_syncCrazyflie.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/crazyflie/test_syncLogger.py b/dfall_ws/src/dfall_pkg/crazyradio/test/crazyflie/test_syncLogger.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/crazyflie/test_syncLogger.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/crazyflie/test_syncLogger.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/crtp/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/test/crtp/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/crtp/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/crtp/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/crtp/test_crtpstack.py b/dfall_ws/src/dfall_pkg/crazyradio/test/crtp/test_crtpstack.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/crtp/test_crtpstack.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/crtp/test_crtpstack.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/support/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/test/support/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/support/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/support/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/support/asyncCallbackCaller.py b/dfall_ws/src/dfall_pkg/crazyradio/test/support/asyncCallbackCaller.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/support/asyncCallbackCaller.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/support/asyncCallbackCaller.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/utils/__init__.py b/dfall_ws/src/dfall_pkg/crazyradio/test/utils/__init__.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/utils/__init__.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/utils/__init__.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/test/utils/test_callbacks.py b/dfall_ws/src/dfall_pkg/crazyradio/test/utils/test_callbacks.py
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/test/utils/test_callbacks.py
rename to dfall_ws/src/dfall_pkg/crazyradio/test/utils/test_callbacks.py
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/tools/build/bdist b/dfall_ws/src/dfall_pkg/crazyradio/tools/build/bdist
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/tools/build/bdist
rename to dfall_ws/src/dfall_pkg/crazyradio/tools/build/bdist
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/tools/build/build b/dfall_ws/src/dfall_pkg/crazyradio/tools/build/build
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/tools/build/build
rename to dfall_ws/src/dfall_pkg/crazyradio/tools/build/build
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/tools/build/test b/dfall_ws/src/dfall_pkg/crazyradio/tools/build/test
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/tools/build/test
rename to dfall_ws/src/dfall_pkg/crazyradio/tools/build/test
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/tools/build/verify b/dfall_ws/src/dfall_pkg/crazyradio/tools/build/verify
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/tools/build/verify
rename to dfall_ws/src/dfall_pkg/crazyradio/tools/build/verify
diff --git a/dfall_ws/src/d_fall_pps/crazyradio/tox.ini b/dfall_ws/src/dfall_pkg/crazyradio/tox.ini
similarity index 100%
rename from dfall_ws/src/d_fall_pps/crazyradio/tox.ini
rename to dfall_ws/src/dfall_pkg/crazyradio/tox.ini
diff --git a/dfall_ws/src/d_fall_pps/include/classes/GetParamtersAndNamespaces.h b/dfall_ws/src/dfall_pkg/include/classes/GetParamtersAndNamespaces.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/classes/GetParamtersAndNamespaces.h
rename to dfall_ws/src/dfall_pkg/include/classes/GetParamtersAndNamespaces.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/BatteryMonitor.h b/dfall_ws/src/dfall_pkg/include/nodes/BatteryMonitor.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/BatteryMonitor.h
rename to dfall_ws/src/dfall_pkg/include/nodes/BatteryMonitor.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/CentralManagerService.h b/dfall_ws/src/dfall_pkg/include/nodes/CentralManagerService.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/CentralManagerService.h
rename to dfall_ws/src/dfall_pkg/include/nodes/CentralManagerService.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/Constants.h b/dfall_ws/src/dfall_pkg/include/nodes/Constants.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/Constants.h
rename to dfall_ws/src/dfall_pkg/include/nodes/Constants.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/CrazyflieIO.h b/dfall_ws/src/dfall_pkg/include/nodes/CrazyflieIO.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/CrazyflieIO.h
rename to dfall_ws/src/dfall_pkg/include/nodes/CrazyflieIO.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/DefaultControllerService.h b/dfall_ws/src/dfall_pkg/include/nodes/DefaultControllerService.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/DefaultControllerService.h
rename to dfall_ws/src/dfall_pkg/include/nodes/DefaultControllerService.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/DemoControllerService.h b/dfall_ws/src/dfall_pkg/include/nodes/DemoControllerService.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/DemoControllerService.h
rename to dfall_ws/src/dfall_pkg/include/nodes/DemoControllerService.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/PPSClient.h b/dfall_ws/src/dfall_pkg/include/nodes/PPSClient.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/PPSClient.h
rename to dfall_ws/src/dfall_pkg/include/nodes/PPSClient.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/ParameterService.h b/dfall_ws/src/dfall_pkg/include/nodes/ParameterService.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/ParameterService.h
rename to dfall_ws/src/dfall_pkg/include/nodes/ParameterService.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/PickerControllerConstants.h b/dfall_ws/src/dfall_pkg/include/nodes/PickerControllerConstants.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/PickerControllerConstants.h
rename to dfall_ws/src/dfall_pkg/include/nodes/PickerControllerConstants.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/PickerControllerService.h b/dfall_ws/src/dfall_pkg/include/nodes/PickerControllerService.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/PickerControllerService.h
rename to dfall_ws/src/dfall_pkg/include/nodes/PickerControllerService.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/RemoteControllerService.h b/dfall_ws/src/dfall_pkg/include/nodes/RemoteControllerService.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/RemoteControllerService.h
rename to dfall_ws/src/dfall_pkg/include/nodes/RemoteControllerService.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/SafeControllerService.h b/dfall_ws/src/dfall_pkg/include/nodes/SafeControllerService.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/SafeControllerService.h
rename to dfall_ws/src/dfall_pkg/include/nodes/SafeControllerService.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/StudentControllerService.h b/dfall_ws/src/dfall_pkg/include/nodes/StudentControllerService.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/StudentControllerService.h
rename to dfall_ws/src/dfall_pkg/include/nodes/StudentControllerService.h
diff --git a/dfall_ws/src/d_fall_pps/include/nodes/TuningControllerService.h b/dfall_ws/src/dfall_pkg/include/nodes/TuningControllerService.h
similarity index 100%
rename from dfall_ws/src/d_fall_pps/include/nodes/TuningControllerService.h
rename to dfall_ws/src/dfall_pkg/include/nodes/TuningControllerService.h
diff --git a/dfall_ws/src/d_fall_pps/launch/Agent.launch b/dfall_ws/src/dfall_pkg/launch/Agent.launch
similarity index 100%
rename from dfall_ws/src/d_fall_pps/launch/Agent.launch
rename to dfall_ws/src/dfall_pkg/launch/Agent.launch
diff --git a/dfall_ws/src/d_fall_pps/launch/Config.sh b/dfall_ws/src/dfall_pkg/launch/Config.sh
similarity index 100%
rename from dfall_ws/src/d_fall_pps/launch/Config.sh
rename to dfall_ws/src/dfall_pkg/launch/Config.sh
diff --git a/dfall_ws/src/d_fall_pps/launch/Coordinator.launch b/dfall_ws/src/dfall_pkg/launch/Coordinator.launch
similarity index 100%
rename from dfall_ws/src/d_fall_pps/launch/Coordinator.launch
rename to dfall_ws/src/dfall_pkg/launch/Coordinator.launch
diff --git a/dfall_ws/src/d_fall_pps/launch/Teacher.launch b/dfall_ws/src/dfall_pkg/launch/Teacher.launch
similarity index 100%
rename from dfall_ws/src/d_fall_pps/launch/Teacher.launch
rename to dfall_ws/src/dfall_pkg/launch/Teacher.launch
diff --git a/dfall_ws/src/d_fall_pps/msg/AreaBounds.msg b/dfall_ws/src/dfall_pkg/msg/AreaBounds.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/AreaBounds.msg
rename to dfall_ws/src/dfall_pkg/msg/AreaBounds.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/ControlCommand.msg b/dfall_ws/src/dfall_pkg/msg/ControlCommand.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/ControlCommand.msg
rename to dfall_ws/src/dfall_pkg/msg/ControlCommand.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/CrazyflieContext.msg b/dfall_ws/src/dfall_pkg/msg/CrazyflieContext.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/CrazyflieContext.msg
rename to dfall_ws/src/dfall_pkg/msg/CrazyflieContext.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/CrazyflieDB.msg b/dfall_ws/src/dfall_pkg/msg/CrazyflieDB.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/CrazyflieDB.msg
rename to dfall_ws/src/dfall_pkg/msg/CrazyflieDB.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/CrazyflieData.msg b/dfall_ws/src/dfall_pkg/msg/CrazyflieData.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/CrazyflieData.msg
rename to dfall_ws/src/dfall_pkg/msg/CrazyflieData.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/CrazyflieEntry.msg b/dfall_ws/src/dfall_pkg/msg/CrazyflieEntry.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/CrazyflieEntry.msg
rename to dfall_ws/src/dfall_pkg/msg/CrazyflieEntry.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/CustomButton.msg b/dfall_ws/src/dfall_pkg/msg/CustomButton.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/CustomButton.msg
rename to dfall_ws/src/dfall_pkg/msg/CustomButton.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/CustomButtonWithHeader.msg b/dfall_ws/src/dfall_pkg/msg/CustomButtonWithHeader.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/CustomButtonWithHeader.msg
rename to dfall_ws/src/dfall_pkg/msg/CustomButtonWithHeader.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/DebugMsg.msg b/dfall_ws/src/dfall_pkg/msg/DebugMsg.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/DebugMsg.msg
rename to dfall_ws/src/dfall_pkg/msg/DebugMsg.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/FloatWithHeader.msg b/dfall_ws/src/dfall_pkg/msg/FloatWithHeader.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/FloatWithHeader.msg
rename to dfall_ws/src/dfall_pkg/msg/FloatWithHeader.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/IntWithHeader.msg b/dfall_ws/src/dfall_pkg/msg/IntWithHeader.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/IntWithHeader.msg
rename to dfall_ws/src/dfall_pkg/msg/IntWithHeader.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/Setpoint.msg b/dfall_ws/src/dfall_pkg/msg/Setpoint.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/Setpoint.msg
rename to dfall_ws/src/dfall_pkg/msg/Setpoint.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/SetpointV2.msg b/dfall_ws/src/dfall_pkg/msg/SetpointV2.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/SetpointV2.msg
rename to dfall_ws/src/dfall_pkg/msg/SetpointV2.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/SetpointWithHeader.msg b/dfall_ws/src/dfall_pkg/msg/SetpointWithHeader.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/SetpointWithHeader.msg
rename to dfall_ws/src/dfall_pkg/msg/SetpointWithHeader.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/StringWithHeader.msg b/dfall_ws/src/dfall_pkg/msg/StringWithHeader.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/StringWithHeader.msg
rename to dfall_ws/src/dfall_pkg/msg/StringWithHeader.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/UnlabeledMarker.msg b/dfall_ws/src/dfall_pkg/msg/UnlabeledMarker.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/UnlabeledMarker.msg
rename to dfall_ws/src/dfall_pkg/msg/UnlabeledMarker.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/ViconData.msg b/dfall_ws/src/dfall_pkg/msg/ViconData.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/ViconData.msg
rename to dfall_ws/src/dfall_pkg/msg/ViconData.msg
diff --git a/dfall_ws/src/d_fall_pps/msg/ViconSubscribeObjectName.msg b/dfall_ws/src/dfall_pkg/msg/ViconSubscribeObjectName.msg
similarity index 100%
rename from dfall_ws/src/d_fall_pps/msg/ViconSubscribeObjectName.msg
rename to dfall_ws/src/dfall_pkg/msg/ViconSubscribeObjectName.msg
diff --git a/dfall_ws/src/d_fall_pps/package.xml b/dfall_ws/src/dfall_pkg/package.xml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/package.xml
rename to dfall_ws/src/dfall_pkg/package.xml
diff --git a/dfall_ws/src/d_fall_pps/param/BatteryMonitor.yaml b/dfall_ws/src/dfall_pkg/param/BatteryMonitor.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/BatteryMonitor.yaml
rename to dfall_ws/src/dfall_pkg/param/BatteryMonitor.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/ClientConfig.yaml b/dfall_ws/src/dfall_pkg/param/ClientConfig.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/ClientConfig.yaml
rename to dfall_ws/src/dfall_pkg/param/ClientConfig.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/DefaultController.yaml b/dfall_ws/src/dfall_pkg/param/DefaultController.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/DefaultController.yaml
rename to dfall_ws/src/dfall_pkg/param/DefaultController.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/DemoController.yaml b/dfall_ws/src/dfall_pkg/param/DemoController.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/DemoController.yaml
rename to dfall_ws/src/dfall_pkg/param/DemoController.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/MpcController.yaml b/dfall_ws/src/dfall_pkg/param/MpcController.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/MpcController.yaml
rename to dfall_ws/src/dfall_pkg/param/MpcController.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/PickerController.yaml b/dfall_ws/src/dfall_pkg/param/PickerController.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/PickerController.yaml
rename to dfall_ws/src/dfall_pkg/param/PickerController.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/RemoteController.yaml b/dfall_ws/src/dfall_pkg/param/RemoteController.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/RemoteController.yaml
rename to dfall_ws/src/dfall_pkg/param/RemoteController.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/SafeController.yaml b/dfall_ws/src/dfall_pkg/param/SafeController.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/SafeController.yaml
rename to dfall_ws/src/dfall_pkg/param/SafeController.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/StudentController.yaml b/dfall_ws/src/dfall_pkg/param/StudentController.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/StudentController.yaml
rename to dfall_ws/src/dfall_pkg/param/StudentController.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/TuningController.yaml b/dfall_ws/src/dfall_pkg/param/TuningController.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/TuningController.yaml
rename to dfall_ws/src/dfall_pkg/param/TuningController.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/ViconConfig.yaml b/dfall_ws/src/dfall_pkg/param/ViconConfig.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/ViconConfig.yaml
rename to dfall_ws/src/dfall_pkg/param/ViconConfig.yaml
diff --git a/dfall_ws/src/d_fall_pps/param/YamlFileNames.yaml b/dfall_ws/src/dfall_pkg/param/YamlFileNames.yaml
similarity index 100%
rename from dfall_ws/src/d_fall_pps/param/YamlFileNames.yaml
rename to dfall_ws/src/dfall_pkg/param/YamlFileNames.yaml
diff --git a/dfall_ws/src/d_fall_pps/scripts/land_crazyflie b/dfall_ws/src/dfall_pkg/scripts/land_crazyflie
similarity index 100%
rename from dfall_ws/src/d_fall_pps/scripts/land_crazyflie
rename to dfall_ws/src/dfall_pkg/scripts/land_crazyflie
diff --git a/dfall_ws/src/d_fall_pps/scripts/load_custom_controller b/dfall_ws/src/dfall_pkg/scripts/load_custom_controller
similarity index 100%
rename from dfall_ws/src/d_fall_pps/scripts/load_custom_controller
rename to dfall_ws/src/dfall_pkg/scripts/load_custom_controller
diff --git a/dfall_ws/src/d_fall_pps/scripts/load_safe_controller b/dfall_ws/src/dfall_pkg/scripts/load_safe_controller
similarity index 100%
rename from dfall_ws/src/d_fall_pps/scripts/load_safe_controller
rename to dfall_ws/src/dfall_pkg/scripts/load_safe_controller
diff --git a/dfall_ws/src/d_fall_pps/scripts/motors_off_crazyflie b/dfall_ws/src/dfall_pkg/scripts/motors_off_crazyflie
similarity index 100%
rename from dfall_ws/src/d_fall_pps/scripts/motors_off_crazyflie
rename to dfall_ws/src/dfall_pkg/scripts/motors_off_crazyflie
diff --git a/dfall_ws/src/d_fall_pps/scripts/safe_controller_setpoint b/dfall_ws/src/dfall_pkg/scripts/safe_controller_setpoint
similarity index 100%
rename from dfall_ws/src/d_fall_pps/scripts/safe_controller_setpoint
rename to dfall_ws/src/dfall_pkg/scripts/safe_controller_setpoint
diff --git a/dfall_ws/src/d_fall_pps/scripts/take_off_crazyflie b/dfall_ws/src/dfall_pkg/scripts/take_off_crazyflie
similarity index 100%
rename from dfall_ws/src/d_fall_pps/scripts/take_off_crazyflie
rename to dfall_ws/src/dfall_pkg/scripts/take_off_crazyflie
diff --git a/dfall_ws/src/d_fall_pps/src/CrazyflieIO.cpp b/dfall_ws/src/dfall_pkg/src/CrazyflieIO.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/CrazyflieIO.cpp
rename to dfall_ws/src/dfall_pkg/src/CrazyflieIO.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/classes/GetParamtersAndNamespaces.cpp b/dfall_ws/src/dfall_pkg/src/classes/GetParamtersAndNamespaces.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/classes/GetParamtersAndNamespaces.cpp
rename to dfall_ws/src/dfall_pkg/src/classes/GetParamtersAndNamespaces.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/BatteryMonitor.cpp b/dfall_ws/src/dfall_pkg/src/nodes/BatteryMonitor.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/BatteryMonitor.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/BatteryMonitor.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/CentralManagerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/CentralManagerService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/CentralManagerService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/CentralManagerService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/DefaultControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/DefaultControllerService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/DemoControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/DemoControllerService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/DemoControllerService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/DemoControllerService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/MpcControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/MpcControllerService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/MpcControllerService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/MpcControllerService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/PPSClient.cpp b/dfall_ws/src/dfall_pkg/src/nodes/PPSClient.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/PPSClient.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/PPSClient.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/ParameterService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/ParameterService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/ParameterService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/ParameterService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/PickerControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/PickerControllerService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/PickerControllerService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/PickerControllerService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/RemoteControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/RemoteControllerService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/RemoteControllerService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/RemoteControllerService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/SafeControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/SafeControllerService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/SafeControllerService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/SafeControllerService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/StudentControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/StudentControllerService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/StudentControllerService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/StudentControllerService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/TuningControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/TuningControllerService.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/TuningControllerService.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/TuningControllerService.cpp
diff --git a/dfall_ws/src/d_fall_pps/src/nodes/ViconDataPublisher.cpp b/dfall_ws/src/dfall_pkg/src/nodes/ViconDataPublisher.cpp
similarity index 100%
rename from dfall_ws/src/d_fall_pps/src/nodes/ViconDataPublisher.cpp
rename to dfall_ws/src/dfall_pkg/src/nodes/ViconDataPublisher.cpp
diff --git a/dfall_ws/src/d_fall_pps/srv/CMCommand.srv b/dfall_ws/src/dfall_pkg/srv/CMCommand.srv
similarity index 100%
rename from dfall_ws/src/d_fall_pps/srv/CMCommand.srv
rename to dfall_ws/src/dfall_pkg/srv/CMCommand.srv
diff --git a/dfall_ws/src/d_fall_pps/srv/CMQuery.srv b/dfall_ws/src/dfall_pkg/srv/CMQuery.srv
similarity index 100%
rename from dfall_ws/src/d_fall_pps/srv/CMQuery.srv
rename to dfall_ws/src/dfall_pkg/srv/CMQuery.srv
diff --git a/dfall_ws/src/d_fall_pps/srv/CMRead.srv b/dfall_ws/src/dfall_pkg/srv/CMRead.srv
similarity index 100%
rename from dfall_ws/src/d_fall_pps/srv/CMRead.srv
rename to dfall_ws/src/dfall_pkg/srv/CMRead.srv
diff --git a/dfall_ws/src/d_fall_pps/srv/CMUpdate.srv b/dfall_ws/src/dfall_pkg/srv/CMUpdate.srv
similarity index 100%
rename from dfall_ws/src/d_fall_pps/srv/CMUpdate.srv
rename to dfall_ws/src/dfall_pkg/srv/CMUpdate.srv
diff --git a/dfall_ws/src/d_fall_pps/srv/Controller.srv b/dfall_ws/src/dfall_pkg/srv/Controller.srv
similarity index 100%
rename from dfall_ws/src/d_fall_pps/srv/Controller.srv
rename to dfall_ws/src/dfall_pkg/srv/Controller.srv
diff --git a/dfall_ws/src/d_fall_pps/srv/GetSetpointService.srv b/dfall_ws/src/dfall_pkg/srv/GetSetpointService.srv
similarity index 100%
rename from dfall_ws/src/d_fall_pps/srv/GetSetpointService.srv
rename to dfall_ws/src/dfall_pkg/srv/GetSetpointService.srv
diff --git a/dfall_ws/src/d_fall_pps/srv/IntIntService.srv b/dfall_ws/src/dfall_pkg/srv/IntIntService.srv
similarity index 100%
rename from dfall_ws/src/d_fall_pps/srv/IntIntService.srv
rename to dfall_ws/src/dfall_pkg/srv/IntIntService.srv
diff --git a/dfall_ws/src/d_fall_pps/srv/LoadYamlFromFilename.srv b/dfall_ws/src/dfall_pkg/srv/LoadYamlFromFilename.srv
similarity index 100%
rename from dfall_ws/src/d_fall_pps/srv/LoadYamlFromFilename.srv
rename to dfall_ws/src/dfall_pkg/srv/LoadYamlFromFilename.srv