diff --git a/FlashFiles/flash_download_tool_3.9.5.zip b/FlashFiles/flash_download_tool_3.9.5.zip
new file mode 100644
index 000000000..6401766bb
Binary files /dev/null and b/FlashFiles/flash_download_tool_3.9.5.zip differ
diff --git a/mechanical/Marauder-Mini/Marauder-Mini_Top_cutout.stl b/mechanical/Marauder-Mini/MachineScrews/Marauder-Mini_Top_cutout.stl
similarity index 100%
rename from mechanical/Marauder-Mini/Marauder-Mini_Top_cutout.stl
rename to mechanical/Marauder-Mini/MachineScrews/Marauder-Mini_Top_cutout.stl
diff --git a/mechanical/Marauder-Mini/MarauderMini-Bottom v11.stl b/mechanical/Marauder-Mini/MachineScrews/MarauderMini-Bottom v11.stl
similarity index 100%
rename from mechanical/Marauder-Mini/MarauderMini-Bottom v11.stl
rename to mechanical/Marauder-Mini/MachineScrews/MarauderMini-Bottom v11.stl
diff --git a/mechanical/Marauder-Mini/MarauderMini-Bottom v12 (SMA).stl b/mechanical/Marauder-Mini/MachineScrews/MarauderMini-Bottom v12 (SMA).stl
similarity index 100%
rename from mechanical/Marauder-Mini/MarauderMini-Bottom v12 (SMA).stl
rename to mechanical/Marauder-Mini/MachineScrews/MarauderMini-Bottom v12 (SMA).stl
diff --git a/mechanical/Marauder-Mini/MachineScrews/MarauderMini-Bottom v17 (Dual SMA).stl b/mechanical/Marauder-Mini/MachineScrews/MarauderMini-Bottom v17 (Dual SMA).stl
new file mode 100644
index 000000000..ef5e1792c
Binary files /dev/null and b/mechanical/Marauder-Mini/MachineScrews/MarauderMini-Bottom v17 (Dual SMA).stl differ
diff --git a/mechanical/Marauder-Mini/ThreadFormingScrews/Marauder-Mini_Top_cutout v5.stl b/mechanical/Marauder-Mini/ThreadFormingScrews/Marauder-Mini_Top_cutout v5.stl
new file mode 100644
index 000000000..021ee16f0
Binary files /dev/null and b/mechanical/Marauder-Mini/ThreadFormingScrews/Marauder-Mini_Top_cutout v5.stl differ
diff --git a/mechanical/Marauder-Mini/ThreadFormingScrews/MarauderMini-Bottom v18 (Dual SMA).stl b/mechanical/Marauder-Mini/ThreadFormingScrews/MarauderMini-Bottom v18 (Dual SMA).stl
new file mode 100644
index 000000000..925328c00
Binary files /dev/null and b/mechanical/Marauder-Mini/ThreadFormingScrews/MarauderMini-Bottom v18 (Dual SMA).stl differ
diff --git a/mechanical/Marauder-Mini/ThreadFormingScrews/MarauderMini-Bottom v19 (Internal).stl b/mechanical/Marauder-Mini/ThreadFormingScrews/MarauderMini-Bottom v19 (Internal).stl
new file mode 100644
index 000000000..c79427783
Binary files /dev/null and b/mechanical/Marauder-Mini/ThreadFormingScrews/MarauderMini-Bottom v19 (Internal).stl differ
diff --git a/mechanical/Marauder-Mini/ThreadFormingScrews/MarauderMini-Bottom v20 (SMA).stl b/mechanical/Marauder-Mini/ThreadFormingScrews/MarauderMini-Bottom v20 (SMA).stl
new file mode 100644
index 000000000..199a34c3a
Binary files /dev/null and b/mechanical/Marauder-Mini/ThreadFormingScrews/MarauderMini-Bottom v20 (SMA).stl differ