diff --git a/.DS_Store b/.DS_Store
index ef63991b303af56a5e67d024c8ff6ef11d72e173..2f6c8baa087840ed0d0a49cc671c6284316de5af 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/rocolib/.DS_Store b/rocolib/.DS_Store
index 6b9edd3d9ec58702d23220631401a1d462e15e8a..99670c936ce30df7e5084dde87d0ecf9b8bfbaa0 100644
Binary files a/rocolib/.DS_Store and b/rocolib/.DS_Store differ
diff --git a/rocolib/builders/.DS_Store b/rocolib/builders/.DS_Store
index fc5aed497f35f030d7b81b2b7b1743afb3d6fd2f..6f81ccd563986846ee635e7146f742c3552ea4b0 100644
Binary files a/rocolib/builders/.DS_Store and b/rocolib/builders/.DS_Store differ
diff --git a/rocolib/builders/boat/.DS_Store b/rocolib/builders/boat/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8a7ae2a762ee7a194ef146b1ca33d0b98c548aa6
Binary files /dev/null and b/rocolib/builders/boat/.DS_Store differ
diff --git a/rocolib/builders/boat/BatteryStackHolderBuilder.py b/rocolib/builders/boat/mounts/BatteryStackHolderBuilder.py
similarity index 100%
rename from rocolib/builders/boat/BatteryStackHolderBuilder.py
rename to rocolib/builders/boat/mounts/BatteryStackHolderBuilder.py
diff --git a/rocolib/builders/boat/BatteryStackMountBuilder.py b/rocolib/builders/boat/mounts/BatteryStackMountBuilder.py
similarity index 100%
rename from rocolib/builders/boat/BatteryStackMountBuilder.py
rename to rocolib/builders/boat/mounts/BatteryStackMountBuilder.py
diff --git a/rocolib/builders/boat/DCMotorMountBuilder.py b/rocolib/builders/boat/mounts/DCMotorMountBuilder.py
similarity index 100%
rename from rocolib/builders/boat/DCMotorMountBuilder.py
rename to rocolib/builders/boat/mounts/DCMotorMountBuilder.py
diff --git a/rocolib/builders/boat/DoubleServoMountBuilder.py b/rocolib/builders/boat/mounts/DoubleServoMountBuilder.py
similarity index 100%
rename from rocolib/builders/boat/DoubleServoMountBuilder.py
rename to rocolib/builders/boat/mounts/DoubleServoMountBuilder.py
diff --git a/rocolib/builders/boat/ServoMountAndStackBuilder.py b/rocolib/builders/boat/mounts/ServoMountAndStackBuilder.py
similarity index 100%
rename from rocolib/builders/boat/ServoMountAndStackBuilder.py
rename to rocolib/builders/boat/mounts/ServoMountAndStackBuilder.py
diff --git a/rocolib/builders/boat/ServoMountWithArmsBuilder.py b/rocolib/builders/boat/mounts/ServoMountWithArmsBuilder.py
similarity index 100%
rename from rocolib/builders/boat/ServoMountWithArmsBuilder.py
rename to rocolib/builders/boat/mounts/ServoMountWithArmsBuilder.py
diff --git a/rocolib/builders/boat/ServoStackBatteryMountBuilder.py b/rocolib/builders/boat/mounts/ServoStackBatteryMountBuilder.py
similarity index 100%
rename from rocolib/builders/boat/ServoStackBatteryMountBuilder.py
rename to rocolib/builders/boat/mounts/ServoStackBatteryMountBuilder.py
diff --git a/rocolib/builders/boat/SideServoMountBuilder.py b/rocolib/builders/boat/mounts/SideServoMountBuilder.py
similarity index 100%
rename from rocolib/builders/boat/SideServoMountBuilder.py
rename to rocolib/builders/boat/mounts/SideServoMountBuilder.py
diff --git a/rocolib/builders/boat/StackMountBuilder.py b/rocolib/builders/boat/mounts/StackMountBuilder.py
similarity index 100%
rename from rocolib/builders/boat/StackMountBuilder.py
rename to rocolib/builders/boat/mounts/StackMountBuilder.py
diff --git a/rocolib/builders/boat/SubESP32StackBuilder.py b/rocolib/builders/boat/mounts/SubESP32StackBuilder.py
similarity index 100%
rename from rocolib/builders/boat/SubESP32StackBuilder.py
rename to rocolib/builders/boat/mounts/SubESP32StackBuilder.py