diff --git a/drone/animation_lib.py b/drone/modules/animation.py
similarity index 100%
rename from drone/animation_lib.py
rename to drone/modules/animation.py
diff --git a/drone/client_core.py b/drone/modules/client_core.py
similarity index 100%
rename from drone/client_core.py
rename to drone/modules/client_core.py
diff --git a/drone/mavros_mavlink.py b/drone/modules/mavros_wrapper.py
similarity index 100%
rename from drone/mavros_mavlink.py
rename to drone/modules/mavros_wrapper.py
diff --git a/drone/tasking_lib.py b/drone/modules/tasking.py
similarity index 100%
rename from drone/tasking_lib.py
rename to drone/modules/tasking.py
diff --git a/drone/visual_pose_watchdog.py b/drone/modules/watchdog.py
similarity index 100%
rename from drone/visual_pose_watchdog.py
rename to drone/modules/watchdog.py