diff --git a/CAD/assembly/belt/belt_axis.f3z b/CAD/belt_axis/belt_axis.f3z
similarity index 100%
rename from CAD/assembly/belt/belt_axis.f3z
rename to CAD/belt_axis/belt_axis.f3z
diff --git a/CAD/assembly/leadscrew/leadscrew_axis.f3z b/CAD/leadscrew_axis/leadscrew_axis.f3z
similarity index 100%
rename from CAD/assembly/leadscrew/leadscrew_axis.f3z
rename to CAD/leadscrew_axis/leadscrew_axis.f3z
diff --git a/CAD/leadscrew_axis/leadscrew_clip.stl b/CAD/leadscrew_axis/leadscrew_clip.stl
new file mode 100644
index 0000000000000000000000000000000000000000..36262f5aba577f512fe99a1baf9bb73aa08df4f4
Binary files /dev/null and b/CAD/leadscrew_axis/leadscrew_clip.stl differ
diff --git a/CAD/parts/gusset/foot.stl b/CAD/parts/foot.stl
similarity index 100%
rename from CAD/parts/gusset/foot.stl
rename to CAD/parts/foot.stl
diff --git a/CAD/parts/gusset/gusset_T.f3d b/CAD/parts/gusset_T.f3d
similarity index 100%
rename from CAD/parts/gusset/gusset_T.f3d
rename to CAD/parts/gusset_T.f3d
diff --git a/CAD/parts/gusset/gusset_T.stl b/CAD/parts/gusset_T.stl
similarity index 100%
rename from CAD/parts/gusset/gusset_T.stl
rename to CAD/parts/gusset_T.stl
diff --git a/CAD/parts/gusset/gusset_elbow.f3d b/CAD/parts/gusset_elbow.f3d
similarity index 100%
rename from CAD/parts/gusset/gusset_elbow.f3d
rename to CAD/parts/gusset_elbow.f3d
diff --git a/CAD/parts/gusset/gusset_elbow.stl b/CAD/parts/gusset_elbow.stl
similarity index 100%
rename from CAD/parts/gusset/gusset_elbow.stl
rename to CAD/parts/gusset_elbow.stl
diff --git a/CAD/assembly/rotary/rotary_axis.f3z b/CAD/rotary_axis/rotary_axis.f3z
similarity index 100%
rename from CAD/assembly/rotary/rotary_axis.f3z
rename to CAD/rotary_axis/rotary_axis.f3z