diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/ar15 lower v5 reinforced.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/ar15 lower v5 reinforced.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/ar15 lower v5 reinforced.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/ar15 lower v5 reinforced.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/barrel retainer.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/barrel retainer.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/barrel retainer.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/barrel retainer.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/bolt housing.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/bolt housing.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/bolt housing.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/bolt housing.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/buffer retainer bolt.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/buffer retainer bolt.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/buffer retainer bolt.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/buffer retainer bolt.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/buffer retainer.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/buffer retainer.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/buffer retainer.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/buffer retainer.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/buffer tube.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/buffer tube.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/buffer tube.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/buffer tube.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/ejector arm.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/ejector arm.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/ejector arm.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/ejector arm.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/ejector pivot.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/ejector pivot.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/ejector pivot.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/ejector pivot.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/ejector stop.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/ejector stop.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/ejector stop.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/ejector stop.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/feed guide.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/feed guide.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/feed guide.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/feed guide.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/mag bottom plate.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/mag bottom plate.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/mag bottom plate.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/mag bottom plate.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/mag follower.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/mag follower.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/mag follower.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/mag follower.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/magadapter.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/magadapter.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/magadapter.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/magadapter.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/magazine retainer.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/magazine retainer.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/magazine retainer.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/magazine retainer.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/magazine.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/magazine.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/magazine.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/magazine.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/shuty v2 upper.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/shuty v2 upper.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/shuty v2 upper.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/shuty v2 upper.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/simulated firing pin.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/simulated firing pin.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/simulated firing pin.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/simulated firing pin.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/simulated mild steel bolt.FCStd b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/simulated mild steel bolt.FCStd
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/FCStd/simulated mild steel bolt.FCStd
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/FCStd/simulated mild steel bolt.FCStd
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/README.md b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/README.md
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/README.md
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/README.md
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/DSCF1571.jpg b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/DSCF1571.jpg
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/DSCF1571.jpg
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/DSCF1571.jpg
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/DSCF1572.jpg b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/DSCF1572.jpg
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/DSCF1572.jpg
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/DSCF1572.jpg
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/DSCF1573.jpg b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/DSCF1573.jpg
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/DSCF1573.jpg
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/DSCF1573.jpg
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/DSCF1574.jpg b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/DSCF1574.jpg
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/DSCF1574.jpg
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/DSCF1574.jpg
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/print1.png b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/print1.png
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/print1.png
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/print1.png
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/print2.png b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/print2.png
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/Renders/print2.png
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/Renders/print2.png
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/AR15GRIP.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/AR15GRIP.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/AR15GRIP.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/AR15GRIP.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/barrel retainer.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/barrel retainer.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/barrel retainer.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/barrel retainer.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/bolt housing.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/bolt housing.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/bolt housing.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/bolt housing.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/buffer retainer bolt.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/buffer retainer bolt.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/buffer retainer bolt.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/buffer retainer bolt.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/buffer retainer.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/buffer retainer.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/buffer retainer.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/buffer retainer.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/buffer tube.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/buffer tube.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/buffer tube.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/buffer tube.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/ejector arm.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/ejector arm.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/ejector arm.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/ejector arm.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/ejector pivot.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/ejector pivot.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/ejector pivot.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/ejector pivot.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/ejector stop.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/ejector stop.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/ejector stop.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/ejector stop.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/feed guide.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/feed guide.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/feed guide.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/feed guide.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/mag adapter.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/mag adapter.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/mag adapter.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/mag adapter.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/mag bottom plate.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/mag bottom plate.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/mag bottom plate.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/mag bottom plate.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/mag follower.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/mag follower.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/mag follower.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/mag follower.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/mag retainer.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/mag retainer.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/mag retainer.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/mag retainer.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/magazine.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/magazine.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/magazine.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/magazine.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/shuty v2 upper.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/shuty v2 upper.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/shuty v2 upper.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/shuty v2 upper.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/simulated firing pin.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/simulated firing pin.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/simulated firing pin.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/simulated firing pin.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/simulated mild steel bolt.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/simulated mild steel bolt.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/simulated mild steel bolt.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/simulated mild steel bolt.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/v5 lower for shuty.step b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/v5 lower for shuty.step
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STEP/v5 lower for shuty.step
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STEP/v5 lower for shuty.step
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/AR15GRIP.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/AR15GRIP.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/AR15GRIP.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/AR15GRIP.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/barrel retainer.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/barrel retainer.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/barrel retainer.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/barrel retainer.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/bolt housing.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/bolt housing.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/bolt housing.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/bolt housing.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/buffer retainer bolt.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/buffer retainer bolt.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/buffer retainer bolt.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/buffer retainer bolt.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/buffer retainer.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/buffer retainer.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/buffer retainer.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/buffer retainer.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/buffer tube.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/buffer tube.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/buffer tube.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/buffer tube.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/ejector arm.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/ejector arm.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/ejector arm.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/ejector arm.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/ejector pivot.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/ejector pivot.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/ejector pivot.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/ejector pivot.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/ejector stop.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/ejector stop.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/ejector stop.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/ejector stop.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/feed guide.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/feed guide.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/feed guide.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/feed guide.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/mag adapter.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/mag adapter.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/mag adapter.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/mag adapter.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/mag bottom plate.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/mag bottom plate.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/mag bottom plate.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/mag bottom plate.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/mag follower.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/mag follower.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/mag follower.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/mag follower.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/magazine retainer.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/magazine retainer.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/magazine retainer.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/magazine retainer.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/shuty v2 upper.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/shuty v2 upper.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/shuty v2 upper.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/shuty v2 upper.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/simulated firing pin.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/simulated firing pin.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/simulated firing pin.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/simulated firing pin.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/simulated mild steel bolt.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/simulated mild steel bolt.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/simulated mild steel bolt.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/simulated mild steel bolt.stl
diff --git a/Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/v5 lower for shuty.stl b/Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/v5 lower for shuty.stl
similarity index 100%
rename from Pistols/9mm_Shuty_Pistol_v2.0-derwood/STL/v5 lower for shuty.stl
rename to Pistols/9mm_Shuty_AR-15_Pistol_v2.0-derwood/STL/v5 lower for shuty.stl