diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ef63991b303af56a5e67d024c8ff6ef11d72e173
Binary files /dev/null and b/.DS_Store differ
diff --git a/rocolib/.DS_Store b/rocolib/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6b9edd3d9ec58702d23220631401a1d462e15e8a
Binary files /dev/null and b/rocolib/.DS_Store differ
diff --git a/rocolib/builders/.DS_Store b/rocolib/builders/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..fc5aed497f35f030d7b81b2b7b1743afb3d6fd2f
Binary files /dev/null and b/rocolib/builders/.DS_Store differ
diff --git a/rocolib/builders/BatteryStackMountBuilder.py b/rocolib/builders/boat/BatteryStackMountBuilder.py
similarity index 100%
rename from rocolib/builders/BatteryStackMountBuilder.py
rename to rocolib/builders/boat/BatteryStackMountBuilder.py
diff --git a/rocolib/builders/BoatBaseBuilder.py b/rocolib/builders/boat/BoatBaseBuilder.py
similarity index 100%
rename from rocolib/builders/BoatBaseBuilder.py
rename to rocolib/builders/boat/BoatBaseBuilder.py
diff --git a/rocolib/builders/BoatWithDCMountBuilder.py b/rocolib/builders/boat/BoatWithDCMountBuilder.py
similarity index 100%
rename from rocolib/builders/BoatWithDCMountBuilder.py
rename to rocolib/builders/boat/BoatWithDCMountBuilder.py
diff --git a/rocolib/builders/BoatWithServoMountBuilder.py b/rocolib/builders/boat/BoatWithServoMountBuilder.py
similarity index 100%
rename from rocolib/builders/BoatWithServoMountBuilder.py
rename to rocolib/builders/boat/BoatWithServoMountBuilder.py
diff --git a/rocolib/builders/Boat_StackMountBuilder.py b/rocolib/builders/boat/Boat_StackMountBuilder.py
similarity index 100%
rename from rocolib/builders/Boat_StackMountBuilder.py
rename to rocolib/builders/boat/Boat_StackMountBuilder.py
diff --git a/rocolib/builders/DCMotorMountBuilder.py b/rocolib/builders/boat/DCMotorMountBuilder.py
similarity index 100%
rename from rocolib/builders/DCMotorMountBuilder.py
rename to rocolib/builders/boat/DCMotorMountBuilder.py
diff --git a/rocolib/builders/ESP32StackBoatBuilder.py b/rocolib/builders/boat/ESP32StackBoatBuilder.py
similarity index 100%
rename from rocolib/builders/ESP32StackBoatBuilder.py
rename to rocolib/builders/boat/ESP32StackBoatBuilder.py
diff --git a/rocolib/builders/PaddleWheelBuilder.py b/rocolib/builders/boat/PaddleWheelBuilder.py
similarity index 100%
rename from rocolib/builders/PaddleWheelBuilder.py
rename to rocolib/builders/boat/PaddleWheelBuilder.py
diff --git a/rocolib/builders/PaddleboatWithCameraBuilder.py b/rocolib/builders/boat/PaddleboatWithCameraBuilder.py
similarity index 100%
rename from rocolib/builders/PaddleboatWithCameraBuilder.py
rename to rocolib/builders/boat/PaddleboatWithCameraBuilder.py
diff --git a/rocolib/builders/ServoMountWithArmsBuilder.py b/rocolib/builders/boat/ServoMountWithArmsBuilder.py
similarity index 100%
rename from rocolib/builders/ServoMountWithArmsBuilder.py
rename to rocolib/builders/boat/ServoMountWithArmsBuilder.py
diff --git a/rocolib/builders/SideServoMountBuilder.py b/rocolib/builders/boat/SideServoMountBuilder.py
similarity index 100%
rename from rocolib/builders/SideServoMountBuilder.py
rename to rocolib/builders/boat/SideServoMountBuilder.py
diff --git a/rocolib/builders/SubESP32StackBuilder.py b/rocolib/builders/boat/SubESP32StackBuilder.py
similarity index 100%
rename from rocolib/builders/SubESP32StackBuilder.py
rename to rocolib/builders/boat/SubESP32StackBuilder.py