diff --git a/cad/components/extruder/sm25/cad/Printhead-SM25-Rev1.SLDASM b/cad/components/extruder/sm25/cad/Printhead-SM25-Rev1.SLDASM
new file mode 100644
index 00000000..8d9d62a6
Binary files /dev/null and b/cad/components/extruder/sm25/cad/Printhead-SM25-Rev1.SLDASM differ
diff --git a/cad/components/extruder/sm25/cad/Toolhead Mounting Boss.SLDPRT b/cad/components/extruder/sm25/cad/Toolhead Mounting Boss.SLDPRT
new file mode 100644
index 00000000..65c3eed2
Binary files /dev/null and b/cad/components/extruder/sm25/cad/Toolhead Mounting Boss.SLDPRT differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/350_Shields/350_ExtrusionShield.SLDASM b/cad/components/extruder/sm25/cad/screw_25d_40d/350_Shields/350_ExtrusionShield.SLDASM
new file mode 100644
index 00000000..9dedb3d0
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/350_Shields/350_ExtrusionShield.SLDASM differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/350_Shields/351_Shield_x1_1mm_INOX.DXF.SLDPRT b/cad/components/extruder/sm25/cad/screw_25d_40d/350_Shields/351_Shield_x1_1mm_INOX.DXF.SLDPRT
new file mode 100644
index 00000000..e4dfd80b
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/350_Shields/351_Shield_x1_1mm_INOX.DXF.SLDPRT differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/350_Shields/352_ShieldCap_x2_1mm_INOX.SLDPRT b/cad/components/extruder/sm25/cad/screw_25d_40d/350_Shields/352_ShieldCap_x2_1mm_INOX.SLDPRT
new file mode 100644
index 00000000..da63aa4a
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/350_Shields/352_ShieldCap_x2_1mm_INOX.SLDPRT differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/360_Tray/360_CableTray.SLDASM b/cad/components/extruder/sm25/cad/screw_25d_40d/360_Tray/360_CableTray.SLDASM
new file mode 100644
index 00000000..573bf3d4
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/360_Tray/360_CableTray.SLDASM differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/360_Tray/361_Shield_x1_1mm_INOX.DXF.SLDPRT b/cad/components/extruder/sm25/cad/screw_25d_40d/360_Tray/361_Shield_x1_1mm_INOX.DXF.SLDPRT
new file mode 100644
index 00000000..858ebc5c
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/360_Tray/361_Shield_x1_1mm_INOX.DXF.SLDPRT differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/360_Tray/362_ShieldCap_x2_1mm_INOX.SLDPRT b/cad/components/extruder/sm25/cad/screw_25d_40d/360_Tray/362_ShieldCap_x2_1mm_INOX.SLDPRT
new file mode 100644
index 00000000..bcd3994c
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/360_Tray/362_ShieldCap_x2_1mm_INOX.SLDPRT differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/BarrelAssembly-RD-25d-40.SLDASM b/cad/components/extruder/sm25/cad/screw_25d_40d/BarrelAssembly-RD-25d-40.SLDASM
new file mode 100644
index 00000000..c5ccadb7
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/BarrelAssembly-RD-25d-40.SLDASM differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/barrel-25d-40-405/Barrel-25d-40-405.SLDPRT b/cad/components/extruder/sm25/cad/screw_25d_40d/barrel-25d-40-405/Barrel-25d-40-405.SLDPRT
new file mode 100644
index 00000000..882c75c1
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/barrel-25d-40-405/Barrel-25d-40-405.SLDPRT differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/bh/BarrelFlange-RD-25d-40.SLDPRT b/cad/components/extruder/sm25/cad/screw_25d_40d/bh/BarrelFlange-RD-25d-40.SLDPRT
new file mode 100644
index 00000000..a6c50734
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/bh/BarrelFlange-RD-25d-40.SLDPRT differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/bh/BearingHousing-RD-25d-40.SLDPRT b/cad/components/extruder/sm25/cad/screw_25d_40d/bh/BearingHousing-RD-25d-40.SLDPRT
new file mode 100644
index 00000000..28578531
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/bh/BearingHousing-RD-25d-40.SLDPRT differ
diff --git a/cad/components/extruder/sm25/cad/screw_25d_40d/rd-screw-25/RD-Screw-25.SLDPRT b/cad/components/extruder/sm25/cad/screw_25d_40d/rd-screw-25/RD-Screw-25.SLDPRT
new file mode 100644
index 00000000..50ef8a5a
Binary files /dev/null and b/cad/components/extruder/sm25/cad/screw_25d_40d/rd-screw-25/RD-Screw-25.SLDPRT differ
diff --git a/cad/inc/hgh20-01ca-bloco-20mm-sem-abas-1.snapshot.1.zip b/cad/inc/hgh20-01ca-bloco-20mm-sem-abas-1.snapshot.1.zip
deleted file mode 100644
index 1d02fad9..00000000
Binary files a/cad/inc/hgh20-01ca-bloco-20mm-sem-abas-1.snapshot.1.zip and /dev/null differ
diff --git a/cad/inc/limit-switch-me-8108-1.zip b/cad/inc/limit-switch-me-8108-1.zip
deleted file mode 100644
index 6c330582..00000000
Binary files a/cad/inc/limit-switch-me-8108-1.zip and /dev/null differ