diff --git a/cad/Common.FCStd b/cad/Common.FCStd
new file mode 100644
index 0000000..29c872d
Binary files /dev/null and b/cad/Common.FCStd differ
diff --git a/cad/Frame_Assembly.FCStd b/cad/Frame_Assembly.FCStd
deleted file mode 100644
index dd0f367..0000000
Binary files a/cad/Frame_Assembly.FCStd and /dev/null differ
diff --git a/cad/Sheets.FCStd b/cad/Sheets.FCStd
deleted file mode 100644
index 05e508e..0000000
Binary files a/cad/Sheets.FCStd and /dev/null differ
diff --git a/cad/assemblies/Base_Assembly.FCStd b/cad/assemblies/Base_Assembly.FCStd
new file mode 100644
index 0000000..10569e7
Binary files /dev/null and b/cad/assemblies/Base_Assembly.FCStd differ
diff --git a/cad/assemblies/base/Base_Joint_Bottom_Left_ASM.FCStd b/cad/assemblies/base/Base_Joint_Bottom_Left_ASM.FCStd
new file mode 100644
index 0000000..8d71985
Binary files /dev/null and b/cad/assemblies/base/Base_Joint_Bottom_Left_ASM.FCStd differ
diff --git a/cad/assemblies/base/Base_Joint_Bottom_Right_ASM.FCStd b/cad/assemblies/base/Base_Joint_Bottom_Right_ASM.FCStd
new file mode 100644
index 0000000..193d206
Binary files /dev/null and b/cad/assemblies/base/Base_Joint_Bottom_Right_ASM.FCStd differ
diff --git a/cad/assemblies/base/Base_Joint_Top_Left_ASM.FCStd b/cad/assemblies/base/Base_Joint_Top_Left_ASM.FCStd
new file mode 100644
index 0000000..ff41bfd
Binary files /dev/null and b/cad/assemblies/base/Base_Joint_Top_Left_ASM.FCStd differ
diff --git a/cad/assemblies/base/Base_Joint_Top_Right_ASM.FCStd b/cad/assemblies/base/Base_Joint_Top_Right_ASM.FCStd
new file mode 100644
index 0000000..afa5f33
Binary files /dev/null and b/cad/assemblies/base/Base_Joint_Top_Right_ASM.FCStd differ
diff --git a/cad/assemblies/base/Base_Panel_Connectors_ASM.FCStd b/cad/assemblies/base/Base_Panel_Connectors_ASM.FCStd
new file mode 100644
index 0000000..7f4909e
Binary files /dev/null and b/cad/assemblies/base/Base_Panel_Connectors_ASM.FCStd differ
diff --git a/cad/assemblies/base/Base_Panel_Fan_ASM.FCStd b/cad/assemblies/base/Base_Panel_Fan_ASM.FCStd
new file mode 100644
index 0000000..85e3cc9
Binary files /dev/null and b/cad/assemblies/base/Base_Panel_Fan_ASM.FCStd differ
diff --git a/cad/assemblies/base/Base_Plate_Display.FCStd b/cad/assemblies/base/Base_Plate_Display.FCStd
new file mode 100644
index 0000000..fccab44
Binary files /dev/null and b/cad/assemblies/base/Base_Plate_Display.FCStd differ
diff --git a/cad/printed/arm/Arm_Base_Bottom.FCStd b/cad/printed/arm/Arm_Base_Bottom.FCStd
new file mode 100644
index 0000000..ac601d5
Binary files /dev/null and b/cad/printed/arm/Arm_Base_Bottom.FCStd differ
diff --git a/cad/printed/base/Frame_Bearing_Holder.FCStd b/cad/printed/base/Base_Bearing_Holder.FCStd
similarity index 55%
rename from cad/printed/base/Frame_Bearing_Holder.FCStd
rename to cad/printed/base/Base_Bearing_Holder.FCStd
index ffdb09c..5face9e 100644
Binary files a/cad/printed/base/Frame_Bearing_Holder.FCStd and b/cad/printed/base/Base_Bearing_Holder.FCStd differ
diff --git a/cad/printed/base/Base_Electronics_DIN_Rail_Mount.FCStd b/cad/printed/base/Base_Electronics_DIN_Rail_Mount.FCStd
new file mode 100644
index 0000000..6123eec
Binary files /dev/null and b/cad/printed/base/Base_Electronics_DIN_Rail_Mount.FCStd differ
diff --git a/cad/printed/base/Base_Electronics_Main_Board_Mount.FCStd b/cad/printed/base/Base_Electronics_Main_Board_Mount.FCStd
new file mode 100644
index 0000000..5deef59
Binary files /dev/null and b/cad/printed/base/Base_Electronics_Main_Board_Mount.FCStd differ
diff --git a/cad/printed/base/Base_Electronics_Main_Board_RPI_Mount.FCStd b/cad/printed/base/Base_Electronics_Main_Board_RPI_Mount.FCStd
new file mode 100644
index 0000000..0e11263
Binary files /dev/null and b/cad/printed/base/Base_Electronics_Main_Board_RPI_Mount.FCStd differ
diff --git a/cad/printed/base/Base_Electronics_PSU_Mount_Bottom.FCStd b/cad/printed/base/Base_Electronics_PSU_Mount_Bottom.FCStd
new file mode 100644
index 0000000..c37d518
Binary files /dev/null and b/cad/printed/base/Base_Electronics_PSU_Mount_Bottom.FCStd differ
diff --git a/cad/printed/base/Base_Electronics_PSU_Mount_Top.FCStd b/cad/printed/base/Base_Electronics_PSU_Mount_Top.FCStd
new file mode 100644
index 0000000..18c7d0e
Binary files /dev/null and b/cad/printed/base/Base_Electronics_PSU_Mount_Top.FCStd differ
diff --git a/cad/printed/base/Base_Handle.FCStd b/cad/printed/base/Base_Handle.FCStd
new file mode 100644
index 0000000..24aa4a5
Binary files /dev/null and b/cad/printed/base/Base_Handle.FCStd differ
diff --git a/cad/printed/base/Base_Joint_Bottom_Left.FCStd b/cad/printed/base/Base_Joint_Bottom_Left.FCStd
new file mode 100644
index 0000000..c54ea18
Binary files /dev/null and b/cad/printed/base/Base_Joint_Bottom_Left.FCStd differ
diff --git a/cad/printed/base/Base_Joint_Bottom_Right.FCStd b/cad/printed/base/Base_Joint_Bottom_Right.FCStd
new file mode 100644
index 0000000..0237aba
Binary files /dev/null and b/cad/printed/base/Base_Joint_Bottom_Right.FCStd differ
diff --git a/cad/printed/base/Base_Joint_Clamp.FCStd b/cad/printed/base/Base_Joint_Clamp.FCStd
new file mode 100644
index 0000000..b46e6bf
Binary files /dev/null and b/cad/printed/base/Base_Joint_Clamp.FCStd differ
diff --git a/cad/printed/base/Base_Joint_Tip_Bottom.FCStd b/cad/printed/base/Base_Joint_Tip_Bottom.FCStd
new file mode 100644
index 0000000..dcd763b
Binary files /dev/null and b/cad/printed/base/Base_Joint_Tip_Bottom.FCStd differ
diff --git a/cad/printed/base/Base_Joint_Tip_Top.FCStd b/cad/printed/base/Base_Joint_Tip_Top.FCStd
new file mode 100644
index 0000000..10743e0
Binary files /dev/null and b/cad/printed/base/Base_Joint_Tip_Top.FCStd differ
diff --git a/cad/printed/base/Base_Joint_Top_Left.FCStd b/cad/printed/base/Base_Joint_Top_Left.FCStd
new file mode 100644
index 0000000..736eb91
Binary files /dev/null and b/cad/printed/base/Base_Joint_Top_Left.FCStd differ
diff --git a/cad/printed/base/Base_Joint_Top_Right.FCStd b/cad/printed/base/Base_Joint_Top_Right.FCStd
new file mode 100644
index 0000000..f1a6736
Binary files /dev/null and b/cad/printed/base/Base_Joint_Top_Right.FCStd differ
diff --git a/cad/printed/base/Base_Motor_Mount.FCStd b/cad/printed/base/Base_Motor_Mount.FCStd
new file mode 100644
index 0000000..6397f15
Binary files /dev/null and b/cad/printed/base/Base_Motor_Mount.FCStd differ
diff --git a/cad/printed/base/Base_Panel_Blank.FCStd b/cad/printed/base/Base_Panel_Blank.FCStd
new file mode 100644
index 0000000..1255207
Binary files /dev/null and b/cad/printed/base/Base_Panel_Blank.FCStd differ
diff --git a/cad/printed/base/Electronics_Cover_Bottom.FCStd b/cad/printed/base/Base_Panel_Bottom.FCStd
similarity index 56%
rename from cad/printed/base/Electronics_Cover_Bottom.FCStd
rename to cad/printed/base/Base_Panel_Bottom.FCStd
index a7a4a67..e9af794 100644
Binary files a/cad/printed/base/Electronics_Cover_Bottom.FCStd and b/cad/printed/base/Base_Panel_Bottom.FCStd differ
diff --git a/cad/printed/base/Base_Panel_Connectors.FCStd b/cad/printed/base/Base_Panel_Connectors.FCStd
new file mode 100644
index 0000000..d9c3327
Binary files /dev/null and b/cad/printed/base/Base_Panel_Connectors.FCStd differ
diff --git a/cad/printed/base/Electronics_Cover_Display_Module.FCStd b/cad/printed/base/Base_Panel_Display.FCStd
similarity index 55%
rename from cad/printed/base/Electronics_Cover_Display_Module.FCStd
rename to cad/printed/base/Base_Panel_Display.FCStd
index 236ccb0..5da6c51 100644
Binary files a/cad/printed/base/Electronics_Cover_Display_Module.FCStd and b/cad/printed/base/Base_Panel_Display.FCStd differ
diff --git a/cad/printed/base/Base_Panel_Display_Case.FCStd b/cad/printed/base/Base_Panel_Display_Case.FCStd
new file mode 100644
index 0000000..72ce474
Binary files /dev/null and b/cad/printed/base/Base_Panel_Display_Case.FCStd differ
diff --git a/cad/printed/base/Base_Panel_Empty.FCStd b/cad/printed/base/Base_Panel_Empty.FCStd
new file mode 100644
index 0000000..59c9a65
Binary files /dev/null and b/cad/printed/base/Base_Panel_Empty.FCStd differ
diff --git a/cad/printed/base/Base_Panel_Fan&Button.FCStd b/cad/printed/base/Base_Panel_Fan&Button.FCStd
new file mode 100644
index 0000000..0a96a4d
Binary files /dev/null and b/cad/printed/base/Base_Panel_Fan&Button.FCStd differ
diff --git a/cad/printed/base/Base_Panel_Fan.FCStd b/cad/printed/base/Base_Panel_Fan.FCStd
new file mode 100644
index 0000000..8dc5827
Binary files /dev/null and b/cad/printed/base/Base_Panel_Fan.FCStd differ
diff --git a/cad/printed/base/Base_Panel_Top.FCStd b/cad/printed/base/Base_Panel_Top.FCStd
new file mode 100644
index 0000000..1a91055
Binary files /dev/null and b/cad/printed/base/Base_Panel_Top.FCStd differ
diff --git a/cad/printed/base/Electronics_Cover_Center_Module.FCStd b/cad/printed/base/Electronics_Cover_Center_Module.FCStd
deleted file mode 100644
index 1cb0707..0000000
Binary files a/cad/printed/base/Electronics_Cover_Center_Module.FCStd and /dev/null differ
diff --git a/cad/printed/base/Electronics_Cover_Center_Module.stl b/cad/printed/base/Electronics_Cover_Center_Module.stl
deleted file mode 100644
index 3d63bc2..0000000
Binary files a/cad/printed/base/Electronics_Cover_Center_Module.stl and /dev/null differ
diff --git a/cad/printed/base/Electronics_Cover_Connectors_Module.FCStd b/cad/printed/base/Electronics_Cover_Connectors_Module.FCStd
deleted file mode 100644
index ee926ca..0000000
Binary files a/cad/printed/base/Electronics_Cover_Connectors_Module.FCStd and /dev/null differ
diff --git a/cad/printed/base/Electronics_Cover_Empty_Module.FCStd b/cad/printed/base/Electronics_Cover_Empty_Module.FCStd
deleted file mode 100644
index feb880a..0000000
Binary files a/cad/printed/base/Electronics_Cover_Empty_Module.FCStd and /dev/null differ
diff --git a/cad/printed/base/Electronics_Cover_Fan_Module.FCStd b/cad/printed/base/Electronics_Cover_Fan_Module.FCStd
deleted file mode 100644
index 2bca2af..0000000
Binary files a/cad/printed/base/Electronics_Cover_Fan_Module.FCStd and /dev/null differ
diff --git a/cad/printed/base/Electronics_Cover_Top.FCStd b/cad/printed/base/Electronics_Cover_Top.FCStd
deleted file mode 100644
index c2cbd5f..0000000
Binary files a/cad/printed/base/Electronics_Cover_Top.FCStd and /dev/null differ
diff --git a/cad/printed/base/Electronics_DIN_Rail_Holder.FCStd b/cad/printed/base/Electronics_DIN_Rail_Holder.FCStd
deleted file mode 100644
index d57e8fe..0000000
Binary files a/cad/printed/base/Electronics_DIN_Rail_Holder.FCStd and /dev/null differ
diff --git a/cad/printed/base/Electronics_Display.FCStd b/cad/printed/base/Electronics_Display.FCStd
deleted file mode 100644
index 96c664c..0000000
Binary files a/cad/printed/base/Electronics_Display.FCStd and /dev/null differ
diff --git a/cad/printed/base/Frame_Handle.FCStd b/cad/printed/base/Frame_Handle.FCStd
deleted file mode 100644
index fee3eda..0000000
Binary files a/cad/printed/base/Frame_Handle.FCStd and /dev/null differ
diff --git a/cad/printed/base/Frame_Motor_Mount.FCStd b/cad/printed/base/Frame_Motor_Mount.FCStd
deleted file mode 100644
index 86ca95e..0000000
Binary files a/cad/printed/base/Frame_Motor_Mount.FCStd and /dev/null differ
diff --git a/cad/printed/base/Frame_Plate_Bottom.FCStd b/cad/printed/base/Frame_Plate_Bottom.FCStd
deleted file mode 100644
index 44207c0..0000000
Binary files a/cad/printed/base/Frame_Plate_Bottom.FCStd and /dev/null differ
diff --git a/cad/printed/base/Frame_Plate_Top.FCStd b/cad/printed/base/Frame_Plate_Top.FCStd
deleted file mode 100644
index 4db4b7b..0000000
Binary files a/cad/printed/base/Frame_Plate_Top.FCStd and /dev/null differ
diff --git a/cad/printed/base/Frame_Tip_Bottom.FCStd b/cad/printed/base/Frame_Tip_Bottom.FCStd
deleted file mode 100644
index dca8a36..0000000
Binary files a/cad/printed/base/Frame_Tip_Bottom.FCStd and /dev/null differ
diff --git a/cad/printed/base/Frame_Tip_Top.FCStd b/cad/printed/base/Frame_Tip_Top.FCStd
deleted file mode 100644
index 3e87dcc..0000000
Binary files a/cad/printed/base/Frame_Tip_Top.FCStd and /dev/null differ
diff --git a/cad/sourced/608-2RS_22x8x7.FCStd b/cad/sourced/608-2RS_22x8x7.FCStd
index e50ba87..9794b1b 100644
Binary files a/cad/sourced/608-2RS_22x8x7.FCStd and b/cad/sourced/608-2RS_22x8x7.FCStd differ
diff --git a/cad/sourced/Base_Back_Cover.FCStd b/cad/sourced/Base_Back_Cover.FCStd
new file mode 100644
index 0000000..2a3f3cb
Binary files /dev/null and b/cad/sourced/Base_Back_Cover.FCStd differ
diff --git a/cad/sourced/Base_Separator.FCStd b/cad/sourced/Base_Separator.FCStd
new file mode 100644
index 0000000..0c161c3
Binary files /dev/null and b/cad/sourced/Base_Separator.FCStd differ
diff --git a/cad/sourced/C14_Socket_w_Switch_Fuse.FCStd b/cad/sourced/C14_Socket_w_Switch_Fuse.FCStd
index 6d1ce17..fd52f8f 100644
Binary files a/cad/sourced/C14_Socket_w_Switch_Fuse.FCStd and b/cad/sourced/C14_Socket_w_Switch_Fuse.FCStd differ
diff --git a/cad/sourced/DIN_Rail_130mm.FCStd b/cad/sourced/DIN_Rail_130mm.FCStd
index 406e1cf..cdde6a5 100644
Binary files a/cad/sourced/DIN_Rail_130mm.FCStd and b/cad/sourced/DIN_Rail_130mm.FCStd differ
diff --git a/cad/sourced/Electronics_Cover.FCStd b/cad/sourced/Electronics_Cover.FCStd
deleted file mode 100644
index 617b1cf..0000000
Binary files a/cad/sourced/Electronics_Cover.FCStd and /dev/null differ
diff --git a/cad/sourced/Electronics_Separator.FCStd b/cad/sourced/Electronics_Separator.FCStd
deleted file mode 100644
index 70bd0dc..0000000
Binary files a/cad/sourced/Electronics_Separator.FCStd and /dev/null differ
diff --git a/cad/sourced/Fan_40x40.FCStd b/cad/sourced/Fan_40x40.FCStd
index 336d37d..a4f3e7b 100644
Binary files a/cad/sourced/Fan_40x40.FCStd and b/cad/sourced/Fan_40x40.FCStd differ
diff --git a/cad/sourced/Flexible_Shaft_Coupling_5x8.FCStd b/cad/sourced/Flexible_Shaft_Coupling_5x8.FCStd
index 1a22d15..e20c0cf 100644
Binary files a/cad/sourced/Flexible_Shaft_Coupling_5x8.FCStd and b/cad/sourced/Flexible_Shaft_Coupling_5x8.FCStd differ
diff --git a/cad/sourced/Keystone_RJ-45.FCStd b/cad/sourced/Keystone_RJ-45.FCStd
index 0fefe3d..6619b41 100644
Binary files a/cad/sourced/Keystone_RJ-45.FCStd and b/cad/sourced/Keystone_RJ-45.FCStd differ
diff --git a/cad/sourced/Lead_Screw_Tr8_250.FCStd b/cad/sourced/Lead_Screw_Tr8_350.FCStd
similarity index 53%
rename from cad/sourced/Lead_Screw_Tr8_250.FCStd
rename to cad/sourced/Lead_Screw_Tr8_350.FCStd
index de50897..278ecfb 100644
Binary files a/cad/sourced/Lead_Screw_Tr8_250.FCStd and b/cad/sourced/Lead_Screw_Tr8_350.FCStd differ
diff --git a/cad/sourced/Profile-20x20-130.FCStd b/cad/sourced/Profile-20x20-130.FCStd
index bd01476..1c5999c 100644
Binary files a/cad/sourced/Profile-20x20-130.FCStd and b/cad/sourced/Profile-20x20-130.FCStd differ
diff --git a/cad/sourced/Profile-20x20-60.FCStd b/cad/sourced/Profile-20x20-60.FCStd
index 0e5a494..96bd49b 100644
Binary files a/cad/sourced/Profile-20x20-60.FCStd and b/cad/sourced/Profile-20x20-60.FCStd differ
diff --git a/cad/sourced/Profile-20x40-300.FCStd b/cad/sourced/Profile-20x40-300.FCStd
deleted file mode 100644
index 4fcfc44..0000000
Binary files a/cad/sourced/Profile-20x40-300.FCStd and /dev/null differ
diff --git a/cad/sourced/Profile-20x40-400.FCStd b/cad/sourced/Profile-20x40-400.FCStd
new file mode 100644
index 0000000..df6f2fa
Binary files /dev/null and b/cad/sourced/Profile-20x40-400.FCStd differ
diff --git a/cad/sourced/Rapsberry_Pi_3B_Plus.FCStd b/cad/sourced/Rapsberry_Pi_3B_Plus.FCStd
index 884d127..d519650 100644
Binary files a/cad/sourced/Rapsberry_Pi_3B_Plus.FCStd and b/cad/sourced/Rapsberry_Pi_3B_Plus.FCStd differ
diff --git a/cad/sourced/Rocker_Switch.FCStd b/cad/sourced/Rocker_Switch.FCStd
index e79d67c..dd781e1 100644
Binary files a/cad/sourced/Rocker_Switch.FCStd and b/cad/sourced/Rocker_Switch.FCStd differ
diff --git a/cad/sourced/Rod_8_300.FCStd b/cad/sourced/Rod_8_300.FCStd
deleted file mode 100644
index 50dc3a8..0000000
Binary files a/cad/sourced/Rod_8_300.FCStd and /dev/null differ
diff --git a/cad/sourced/Rod_8_400.FCStd b/cad/sourced/Rod_8_400.FCStd
new file mode 100644
index 0000000..a38964d
Binary files /dev/null and b/cad/sourced/Rod_8_400.FCStd differ
diff --git a/cad/sourced/SP-320-12.FCStd b/cad/sourced/SP-320-12.FCStd
index 689b977..2e04042 100644
Binary files a/cad/sourced/SP-320-12.FCStd and b/cad/sourced/SP-320-12.FCStd differ
diff --git a/cad/sourced/WAGO_2002-1201.FCStd b/cad/sourced/WAGO_2002-1201.FCStd
index 990c1f8..41954db 100644
Binary files a/cad/sourced/WAGO_2002-1201.FCStd and b/cad/sourced/WAGO_2002-1201.FCStd differ