diff --git a/tube-fit-test.20250714-205250.FCBak b/mcad/tube-fit-test.20250714-205250.FCBak
similarity index 100%
rename from tube-fit-test.20250714-205250.FCBak
rename to mcad/tube-fit-test.20250714-205250.FCBak
diff --git a/tube-fit-test.FCStd b/mcad/tube-fit-test.FCStd
similarity index 100%
rename from tube-fit-test.FCStd
rename to mcad/tube-fit-test.FCStd
diff --git a/tube-rocket.20250729-215216.FCBak b/mcad/tube-rocket.20250729-215216.FCBak
similarity index 100%
rename from tube-rocket.20250729-215216.FCBak
rename to mcad/tube-rocket.20250729-215216.FCBak
diff --git a/tube-rocket.FCStd b/mcad/tube-rocket.FCStd
similarity index 100%
rename from tube-rocket.FCStd
rename to mcad/tube-rocket.FCStd
diff --git a/motor-mount.stl b/mesh/motor-mount.stl
similarity index 100%
rename from motor-mount.stl
rename to mesh/motor-mount.stl
diff --git a/tube-fit-test-43mm-0.6mm.stl b/mesh/tube-fit-test-43mm-0.6mm.stl
similarity index 100%
rename from tube-fit-test-43mm-0.6mm.stl
rename to mesh/tube-fit-test-43mm-0.6mm.stl
diff --git a/tube-rocket-Coupler.stl b/mesh/tube-rocket-Coupler.stl
similarity index 100%
rename from tube-rocket-Coupler.stl
rename to mesh/tube-rocket-Coupler.stl
diff --git a/tube-rocket-FinCan-mk2.stl b/mesh/tube-rocket-FinCan-mk2.stl
similarity index 100%
rename from tube-rocket-FinCan-mk2.stl
rename to mesh/tube-rocket-FinCan-mk2.stl
diff --git a/tube-rocket-FinCan.stl b/mesh/tube-rocket-FinCan.stl
similarity index 100%
rename from tube-rocket-FinCan.stl
rename to mesh/tube-rocket-FinCan.stl
diff --git a/tube-rocket-NoseCone-von-karman-3to1.stl b/mesh/tube-rocket-NoseCone-von-karman-3to1.stl
similarity index 100%
rename from tube-rocket-NoseCone-von-karman-3to1.stl
rename to mesh/tube-rocket-NoseCone-von-karman-3to1.stl
diff --git a/tube-fit-test-43mm-0.6mm_0.6n_0.15mm_PLA_MK3S_17m.gcode b/mfg/tube-fit-test-43mm-0.6mm_0.6n_0.15mm_PLA_MK3S_17m.gcode
similarity index 100%
rename from tube-fit-test-43mm-0.6mm_0.6n_0.15mm_PLA_MK3S_17m.gcode
rename to mfg/tube-fit-test-43mm-0.6mm_0.6n_0.15mm_PLA_MK3S_17m.gcode
diff --git a/tube-rocket-FinCan_0.6n_0.15mm_PLA_MK3S_3h31m.gcode b/mfg/tube-rocket-FinCan_0.6n_0.15mm_PLA_MK3S_3h31m.gcode
similarity index 100%
rename from tube-rocket-FinCan_0.6n_0.15mm_PLA_MK3S_3h31m.gcode
rename to mfg/tube-rocket-FinCan_0.6n_0.15mm_PLA_MK3S_3h31m.gcode
diff --git a/tube-rocket-NoseCone-von-karman-3to1_0.6n_0.15mm_PLA_MK3S_2h55m.gcode b/mfg/tube-rocket-NoseCone-von-karman-3to1_0.6n_0.15mm_PLA_MK3S_2h55m.gcode
similarity index 100%
rename from tube-rocket-NoseCone-von-karman-3to1_0.6n_0.15mm_PLA_MK3S_2h55m.gcode
rename to mfg/tube-rocket-NoseCone-von-karman-3to1_0.6n_0.15mm_PLA_MK3S_2h55m.gcode
diff --git a/2-tube.ork b/sim/2-tube.ork
similarity index 100%
rename from 2-tube.ork
rename to sim/2-tube.ork
diff --git a/temp/tube-rocket.FCStd b/temp/tube-rocket.FCStd
deleted file mode 100644
index ad9b62d..0000000
Binary files a/temp/tube-rocket.FCStd and /dev/null differ