diff --git a/cad/storch-150/cad/Global-Storch-150.SLDASM b/cad/storch-150/cad/Global-Storch-150.SLDASM
index 7e969e2d..74711c33 100644
Binary files a/cad/storch-150/cad/Global-Storch-150.SLDASM and b/cad/storch-150/cad/Global-Storch-150.SLDASM differ
diff --git a/cad/storch-150/cad/components/axis-1605/Axis-1605.SLDASM b/cad/storch-150/cad/components/axis-1605/Axis-1605.SLDASM
index b81b3401..6af8896d 100644
Binary files a/cad/storch-150/cad/components/axis-1605/Axis-1605.SLDASM and b/cad/storch-150/cad/components/axis-1605/Axis-1605.SLDASM differ
diff --git a/cad/storch-150/cad/components/axis-2005/Axis-2005.SLDASM b/cad/storch-150/cad/components/axis-2005/640_Axis-2005.SLDASM
similarity index 96%
rename from cad/storch-150/cad/components/axis-2005/Axis-2005.SLDASM
rename to cad/storch-150/cad/components/axis-2005/640_Axis-2005.SLDASM
index 6216ff37..b32ea4d9 100644
Binary files a/cad/storch-150/cad/components/axis-2005/Axis-2005.SLDASM and b/cad/storch-150/cad/components/axis-2005/640_Axis-2005.SLDASM differ
diff --git a/cad/storch-150/cad/components/ex25/500_HopperMedium.SLDASM b/cad/storch-150/cad/components/ex25/500_HopperMedium.SLDASM
index 1d50e9dc..acfa3279 100644
Binary files a/cad/storch-150/cad/components/ex25/500_HopperMedium.SLDASM and b/cad/storch-150/cad/components/ex25/500_HopperMedium.SLDASM differ
diff --git a/cad/storch-150/cad/components/ex25/510_HopperMount.SLDASM b/cad/storch-150/cad/components/ex25/510_HopperMount.SLDASM
index a1113380..4d056be3 100644
Binary files a/cad/storch-150/cad/components/ex25/510_HopperMount.SLDASM and b/cad/storch-150/cad/components/ex25/510_HopperMount.SLDASM differ
diff --git a/cad/storch-150/cad/components/ex25/Global-Lydia-3.5.SLDASM b/cad/storch-150/cad/components/ex25/Global-Lydia-3.5.SLDASM
index d6b86af6..384aaa51 100644
Binary files a/cad/storch-150/cad/components/ex25/Global-Lydia-3.5.SLDASM and b/cad/storch-150/cad/components/ex25/Global-Lydia-3.5.SLDASM differ
diff --git a/cad/storch-150/cad/components/ex25/emergency_stop _button.SLDASM b/cad/storch-150/cad/components/ex25/emergency_stop _button.SLDASM
index 4942455c..27185f6a 100644
Binary files a/cad/storch-150/cad/components/ex25/emergency_stop _button.SLDASM and b/cad/storch-150/cad/components/ex25/emergency_stop _button.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/Z-Rail.SLDASM b/cad/storch-150/cad/components/hgr15-rails/600_Z-Rail-40.SLDASM
similarity index 98%
rename from cad/storch-150/cad/components/hgr15-rails/Z-Rail.SLDASM
rename to cad/storch-150/cad/components/hgr15-rails/600_Z-Rail-40.SLDASM
index d623a1b1..570baaaa 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/Z-Rail.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/600_Z-Rail-40.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/HG15-Assembly.SLDASM b/cad/storch-150/cad/components/hgr15-rails/HG15-Assembly.SLDASM
index 63f64be4..288fd3ec 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/HG15-Assembly.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/HG15-Assembly.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/HGH15CA2R1500Z0H_FILE_1.SLDASM b/cad/storch-150/cad/components/hgr15-rails/HGH15CA2R1500Z0H_FILE_1.SLDASM
index 5f0f2846..56c11ede 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/HGH15CA2R1500Z0H_FILE_1.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/HGH15CA2R1500Z0H_FILE_1.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/XY-Rails.SLDASM b/cad/storch-150/cad/components/hgr15-rails/XY-Rails.SLDASM
index 63689263..e9262e86 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/XY-Rails.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/XY-Rails.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/Z-Axis.SLDASM b/cad/storch-150/cad/components/hgr15-rails/Z-Axis.SLDASM
index b06e1873..8f219180 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/Z-Axis.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/Z-Axis.SLDASM differ
diff --git a/cad/storch-150/cad/components/z-axis/605_Gantry-Rail-MountPlate.SLDPRT b/cad/storch-150/cad/components/z-axis/605_Gantry-Rail-MountPlate.SLDPRT
new file mode 100644
index 00000000..3f158199
Binary files /dev/null and b/cad/storch-150/cad/components/z-axis/605_Gantry-Rail-MountPlate.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/Gantry-Rib-Middle.SLDPRT b/cad/storch-150/cad/components/z-axis/Gantry-Rib-Middle.SLDPRT
index 83ec39de..05106e3a 100644
Binary files a/cad/storch-150/cad/components/z-axis/Gantry-Rib-Middle.SLDPRT and b/cad/storch-150/cad/components/z-axis/Gantry-Rib-Middle.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/Gantry-Support-Ribs-Triangle.SLDPRT b/cad/storch-150/cad/components/z-axis/Gantry-Support-Ribs-Triangle.SLDPRT
index a9ca3ae3..5bf739e6 100644
Binary files a/cad/storch-150/cad/components/z-axis/Gantry-Support-Ribs-Triangle.SLDPRT and b/cad/storch-150/cad/components/z-axis/Gantry-Support-Ribs-Triangle.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/Gantry.SLDPRT b/cad/storch-150/cad/components/z-axis/Gantry.SLDPRT
deleted file mode 100644
index a5d8c99f..00000000
Binary files a/cad/storch-150/cad/components/z-axis/Gantry.SLDPRT and /dev/null differ
diff --git a/cad/storch-150/cad/components/z-axis/MirrorSide-Rib-A.SLDPRT b/cad/storch-150/cad/components/z-axis/MirrorSide-Rib-A.SLDPRT
index 417eaeec..fb5a515d 100644
Binary files a/cad/storch-150/cad/components/z-axis/MirrorSide-Rib-A.SLDPRT and b/cad/storch-150/cad/components/z-axis/MirrorSide-Rib-A.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/MirrorSide-Rib-AF.SLDPRT b/cad/storch-150/cad/components/z-axis/MirrorSide-Rib-AF.SLDPRT
index b0347604..6f2861f6 100644
Binary files a/cad/storch-150/cad/components/z-axis/MirrorSide-Rib-AF.SLDPRT and b/cad/storch-150/cad/components/z-axis/MirrorSide-Rib-AF.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/Side-Rib-A.SLDPRT b/cad/storch-150/cad/components/z-axis/Side-Rib-A.SLDPRT
index 5cf259ce..cc584691 100644
Binary files a/cad/storch-150/cad/components/z-axis/Side-Rib-A.SLDPRT and b/cad/storch-150/cad/components/z-axis/Side-Rib-A.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/Side-Rib-AF.SLDPRT b/cad/storch-150/cad/components/z-axis/Side-Rib-AF.SLDPRT
index d9261dbb..7d251b60 100644
Binary files a/cad/storch-150/cad/components/z-axis/Side-Rib-AF.SLDPRT and b/cad/storch-150/cad/components/z-axis/Side-Rib-AF.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/components/Gantry-30-900/660_Gantry-Ribs.SLDASM b/cad/storch-150/cad/components/z-axis/components/Gantry-30-900/660_Gantry-Ribs.SLDASM
new file mode 100644
index 00000000..59bfc942
Binary files /dev/null and b/cad/storch-150/cad/components/z-axis/components/Gantry-30-900/660_Gantry-Ribs.SLDASM differ
diff --git a/cad/storch-150/cad/components/z-axis/components/Gantry-30-900/Gantry-Ribs.SLDASM b/cad/storch-150/cad/components/z-axis/components/Gantry-30-900/Gantry-Ribs.SLDASM
deleted file mode 100644
index f1d85625..00000000
Binary files a/cad/storch-150/cad/components/z-axis/components/Gantry-30-900/Gantry-Ribs.SLDASM and /dev/null differ
diff --git a/cad/storch-150/cad/components/z-axis/sfu2005/30302-J2-SKF-Block.SLDPRT b/cad/storch-150/cad/components/z-axis/sfu2005/30302-J2-SKF-Block.SLDPRT
index 33422abc..db5709a2 100644
Binary files a/cad/storch-150/cad/components/z-axis/sfu2005/30302-J2-SKF-Block.SLDPRT and b/cad/storch-150/cad/components/z-axis/sfu2005/30302-J2-SKF-Block.SLDPRT differ