diff --git a/.gitignore b/.gitignore
index 895aa70d..96d2a4a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,8 @@ build-deploy/
 bin/
 obj/
 *.swp
+
+Distribution/Restock/GameData/ReStock/Spaces/**/*.png
+Distribution/Restock/GameData/ReStock/Props/**/*.png
 Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
-Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png
\ No newline at end of file
+Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png
diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg
index d2003bac..cd9d4dfa 100644
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg
@@ -23,6 +23,13 @@
     rotation = 0, 0, 0
   }
 
+  !INTERNAL,* {}
+
+  INTERNAL
+  {
+    name = restock-airlock-1-IVA
+  }
+
   @MODULE[ModuleAnimateGeneric]
   {
     @animationName = Deploy
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.cfg b/Distribution/Restock/GameData/ReStock/Props/Hatches/RS_HTCH_625.cfg
similarity index 73%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.cfg
rename to Distribution/Restock/GameData/ReStock/Props/Hatches/RS_HTCH_625.cfg
index b29ffa0e..dc9f7b78 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.cfg
+++ b/Distribution/Restock/GameData/ReStock/Props/Hatches/RS_HTCH_625.cfg
@@ -5,7 +5,7 @@ PROP
   name = RS_HTCH_625
   MODEL
   {
-    model = ReStockPlus/Props/Hatches/RS_HTCH_625
+    model = ReStock/Props/Hatches/RS_HTCH_625
   }
 }
 
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.mu b/Distribution/Restock/GameData/ReStock/Props/Hatches/RS_HTCH_625.mu
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/RS_HTCH_625.mu
rename to Distribution/Restock/GameData/ReStock/Props/Hatches/RS_HTCH_625.mu
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1-n.dds b/Distribution/Restock/GameData/ReStock/Props/Hatches/restock-props-hatches-1-n.dds
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1-n.dds
rename to Distribution/Restock/GameData/ReStock/Props/Hatches/restock-props-hatches-1-n.dds
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1.dds b/Distribution/Restock/GameData/ReStock/Props/Hatches/restock-props-hatches-1.dds
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Hatches/restock-props-hatches-1.dds
rename to Distribution/Restock/GameData/ReStock/Props/Hatches/restock-props-hatches-1.dds
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.cfg b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Green.cfg
similarity index 75%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.cfg
rename to Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Green.cfg
index a93e0b60..58344f3c 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.cfg
+++ b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Green.cfg
@@ -5,7 +5,7 @@ PROP
   name = RS_LGHT_Airlock_Green
   MODEL
   {
-    model = ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green
+    model = ReStock/Props/Lights/RS_LGHT_Airlock_Green
   }
 }
 
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.mu b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Green.mu
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Green.mu
rename to Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Green.mu
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.cfg b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Red.cfg
similarity index 75%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.cfg
rename to Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Red.cfg
index c4e26c35..834be2e1 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.cfg
+++ b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Red.cfg
@@ -5,7 +5,7 @@ PROP
   name = RS_LGHT_Airlock_Red
   MODEL
   {
-    model = ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red
+    model = ReStock/Props/Lights/RS_LGHT_Airlock_Red
   }
 }
 
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.mu b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Red.mu
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Airlock_Red.mu
rename to Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Airlock_Red.mu
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.cfg b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Box_1.cfg
similarity index 90%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.cfg
rename to Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Box_1.cfg
index 2970c0ce..76407208 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.cfg
+++ b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Box_1.cfg
@@ -5,7 +5,7 @@ PROP
   name = RS_LGHT_Box_1
   MODEL
   {
-    model = ReStockPlus/Props/Lights/RS_LGHT_Box_1
+    model = ReStock/Props/Lights/RS_LGHT_Box_1
   }
 
   //MODULE
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.mu b/Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Box_1.mu
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/RS_LGHT_Box_1.mu
rename to Distribution/Restock/GameData/ReStock/Props/Lights/RS_LGHT_Box_1.mu
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-e.dds b/Distribution/Restock/GameData/ReStock/Props/Lights/restock-props-lamps-1-e.dds
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-e.dds
rename to Distribution/Restock/GameData/ReStock/Props/Lights/restock-props-lamps-1-e.dds
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-n.dds b/Distribution/Restock/GameData/ReStock/Props/Lights/restock-props-lamps-1-n.dds
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1-n.dds
rename to Distribution/Restock/GameData/ReStock/Props/Lights/restock-props-lamps-1-n.dds
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1.dds b/Distribution/Restock/GameData/ReStock/Props/Lights/restock-props-lamps-1.dds
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Props/Lights/restock-props-lamps-1.dds
rename to Distribution/Restock/GameData/ReStock/Props/Lights/restock-props-lamps-1.dds
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-e.dds b/Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA-e.dds
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-e.dds
rename to Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA-e.dds
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-lightmap.dds b/Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA-lightmap.dds
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-lightmap.dds
rename to Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA-lightmap.dds
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-mask.mu b/Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA-mask.mu
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-mask.mu
rename to Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA-mask.mu
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-n.dds b/Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA-n.dds
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-n.dds
rename to Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA-n.dds
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.cfg b/Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA.cfg
similarity index 95%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.cfg
rename to Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA.cfg
index bdc24ea5..a9c15a31 100755
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.cfg
+++ b/Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA.cfg
@@ -3,11 +3,11 @@ INTERNAL
 	name = restock-airlock-1-IVA
 	MODEL
 	{
-		model = ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA
+		model = ReStock/Spaces/Airlock/restock-airlock-1-IVA
 	}
 	MODEL
 	{
-		model = ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA-mask
+		model = ReStock/Spaces/Airlock/restock-airlock-1-IVA-mask
 	}
 	MODULE
 	{
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.dds b/Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA.dds
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.dds
rename to Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA.dds
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.mu b/Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA.mu
similarity index 100%
rename from Distribution/RestockPlus/GameData/ReStockPlus/Spaces/Airlock/restock-airlock-1-IVA.mu
rename to Distribution/Restock/GameData/ReStock/Spaces/Airlock/restock-airlock-1-IVA.mu