diff --git a/packages/convert_mapcfgs.sh b/packages/convert_mapcfgs.sh
index a5888f20..d6873478 100644
--- a/packages/convert_mapcfgs.sh
+++ b/packages/convert_mapcfgs.sh
@@ -13,12 +13,36 @@ while getopts "c:" copt; do
       sed -i 's/rattrap\/ventflap/jcdpc\/ventflap/g' $OPTARG
       sed -i 's/rattrap\/milkcrate2/ratboy\/toca_milkcrate_blue/g' $OPTARG
       sed -i 's/rattrap\/milkcrate1/ratboy\/toca_milkcrate_red/g' $OPTARG
+      sed -i 's/aard/makke\/aardapple_enginebox/g' $OPTARG
+      sed -i 's/barrel/makke\/barrel/g' $OPTARG
+      sed -i 's/barrel2/makke\/barrel_fallen/g' $OPTARG
+      sed -i 's/barrel-toxic/makke\/barrel_toxic/g' $OPTARG
+      sed -i 's/rattrapbarrel/makke\/barrel_newsteel/g' $OPTARG
+      sed -i 's/rattrapbarrel2/makke\/barrel_newsteel_fallen/g' $OPTARG
+      sed -i 's/bench/makke\/bench_seat/g' $OPTARG
+      sed -i 's/bridge/makke\/platform/g' $OPTARG
+      sed -i 's/bridge_shine/makke\/platform_shine/g' $OPTARG
+      sed -i 's/bulb/makke\/lightbulb/g' $OPTARG
+      sed -i 's/can/makke\/coke_can/g' $OPTARG
+      sed -i 's/can2/makke\/coke_can_fallen/g' $OPTARG
+      sed -i 's/chair1/makke\/office_chair/g' $OPTARG
+      sed -i 's/coffeemug/makke\/coffee_mug/g' $OPTARG
+      sed -i 's/comp_bridge/makke\/platform_bridge/g' $OPTARG
+      sed -i 's/drainpipe/makke\/drainpipe/g' $OPTARG
+      sed -i 's/dumpster/makke\/dumpster/g' $OPTARG
+      sed -i 's/elektro/makke\/electric_meter/g' $OPTARG
+      sed -i 's/europalette/makke\/pallet/g' $OPTARG
       echo -e "\a\nConversion finished!"
     else
       echo -e "\a\E[31m\033[1mERROR:\E[0m The path you've stated to the map config file is invalid."
     fi
     else
-      echo -e "\a\E[31m\033[1mERROR:\E[0m Invalid OPTION"
+      echo -e "\a\E[31m\033[1mERROR:\E[0m Invalid OPTION."
       echo -e "Try running this script with the -c option, specifying the path to your maps config file."
   fi
+exit
 done
+
+# If no options are given, this will skip the while loop and output this error.
+echo -e "\a\E[31m\033[1mERROR:\E[0m No OPTION given."
+echo -e "Try running this script with the -c option, specifying the path to your maps config file."
diff --git a/packages/models/mapmodels/aard/md2.cfg b/packages/models/mapmodels/makke/aardapple_enginebox/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/aard/md2.cfg
rename to packages/models/mapmodels/makke/aardapple_enginebox/md2.cfg
diff --git a/packages/models/mapmodels/aard/skin.jpg b/packages/models/mapmodels/makke/aardapple_enginebox/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/aard/skin.jpg
rename to packages/models/mapmodels/makke/aardapple_enginebox/skin.jpg
diff --git a/packages/models/mapmodels/aard/tris.md2 b/packages/models/mapmodels/makke/aardapple_enginebox/tris.md2
similarity index 100%
rename from packages/models/mapmodels/aard/tris.md2
rename to packages/models/mapmodels/makke/aardapple_enginebox/tris.md2
diff --git a/packages/models/mapmodels/barrel/md2.cfg b/packages/models/mapmodels/makke/barrel/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/barrel/md2.cfg
rename to packages/models/mapmodels/makke/barrel/md2.cfg
diff --git a/packages/models/mapmodels/barrel/skin.jpg b/packages/models/mapmodels/makke/barrel/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/barrel/skin.jpg
rename to packages/models/mapmodels/makke/barrel/skin.jpg
diff --git a/packages/models/mapmodels/barrel/tris.md2 b/packages/models/mapmodels/makke/barrel/tris.md2
similarity index 100%
rename from packages/models/mapmodels/barrel/tris.md2
rename to packages/models/mapmodels/makke/barrel/tris.md2
diff --git a/packages/models/mapmodels/barrel2/md2.cfg b/packages/models/mapmodels/makke/barrel_fallen/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/barrel2/md2.cfg
rename to packages/models/mapmodels/makke/barrel_fallen/md2.cfg
diff --git a/packages/models/mapmodels/barrel2/skin.jpg b/packages/models/mapmodels/makke/barrel_fallen/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/barrel2/skin.jpg
rename to packages/models/mapmodels/makke/barrel_fallen/skin.jpg
diff --git a/packages/models/mapmodels/barrel2/tris.md2 b/packages/models/mapmodels/makke/barrel_fallen/tris.md2
similarity index 100%
rename from packages/models/mapmodels/barrel2/tris.md2
rename to packages/models/mapmodels/makke/barrel_fallen/tris.md2
diff --git a/packages/models/mapmodels/rattrapbarrel/md2.cfg b/packages/models/mapmodels/makke/barrel_newsteel/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/rattrapbarrel/md2.cfg
rename to packages/models/mapmodels/makke/barrel_newsteel/md2.cfg
diff --git a/packages/models/mapmodels/rattrapbarrel/skin.jpg b/packages/models/mapmodels/makke/barrel_newsteel/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/rattrapbarrel/skin.jpg
rename to packages/models/mapmodels/makke/barrel_newsteel/skin.jpg
diff --git a/packages/models/mapmodels/rattrapbarrel/tris.md2 b/packages/models/mapmodels/makke/barrel_newsteel/tris.md2
similarity index 100%
rename from packages/models/mapmodels/rattrapbarrel/tris.md2
rename to packages/models/mapmodels/makke/barrel_newsteel/tris.md2
diff --git a/packages/models/mapmodels/rattrapbarrel2/md2.cfg b/packages/models/mapmodels/makke/barrel_newsteel_fallen/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/rattrapbarrel2/md2.cfg
rename to packages/models/mapmodels/makke/barrel_newsteel_fallen/md2.cfg
diff --git a/packages/models/mapmodels/rattrapbarrel2/skin.jpg b/packages/models/mapmodels/makke/barrel_newsteel_fallen/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/rattrapbarrel2/skin.jpg
rename to packages/models/mapmodels/makke/barrel_newsteel_fallen/skin.jpg
diff --git a/packages/models/mapmodels/rattrapbarrel2/tris.md2 b/packages/models/mapmodels/makke/barrel_newsteel_fallen/tris.md2
similarity index 100%
rename from packages/models/mapmodels/rattrapbarrel2/tris.md2
rename to packages/models/mapmodels/makke/barrel_newsteel_fallen/tris.md2
diff --git a/packages/models/mapmodels/barrel-toxic/md3.cfg b/packages/models/mapmodels/makke/barrel_toxic/md3.cfg
similarity index 100%
rename from packages/models/mapmodels/barrel-toxic/md3.cfg
rename to packages/models/mapmodels/makke/barrel_toxic/md3.cfg
diff --git a/packages/models/mapmodels/barrel-toxic/skin.jpg b/packages/models/mapmodels/makke/barrel_toxic/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/barrel-toxic/skin.jpg
rename to packages/models/mapmodels/makke/barrel_toxic/skin.jpg
diff --git a/packages/models/mapmodels/barrel-toxic/skin_toxic.jpg b/packages/models/mapmodels/makke/barrel_toxic/skin_toxic.jpg
similarity index 100%
rename from packages/models/mapmodels/barrel-toxic/skin_toxic.jpg
rename to packages/models/mapmodels/makke/barrel_toxic/skin_toxic.jpg
diff --git a/packages/models/mapmodels/barrel-toxic/tris.md3 b/packages/models/mapmodels/makke/barrel_toxic/tris.md3
similarity index 100%
rename from packages/models/mapmodels/barrel-toxic/tris.md3
rename to packages/models/mapmodels/makke/barrel_toxic/tris.md3
diff --git a/packages/models/mapmodels/bench/md2.cfg b/packages/models/mapmodels/makke/bench_seat/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/bench/md2.cfg
rename to packages/models/mapmodels/makke/bench_seat/md2.cfg
diff --git a/packages/models/mapmodels/bench/skin.jpg b/packages/models/mapmodels/makke/bench_seat/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/bench/skin.jpg
rename to packages/models/mapmodels/makke/bench_seat/skin.jpg
diff --git a/packages/models/mapmodels/bench/tris.md2 b/packages/models/mapmodels/makke/bench_seat/tris.md2
similarity index 100%
rename from packages/models/mapmodels/bench/tris.md2
rename to packages/models/mapmodels/makke/bench_seat/tris.md2
diff --git a/packages/models/mapmodels/can/md2.cfg b/packages/models/mapmodels/makke/coffee_mug/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/can/md2.cfg
rename to packages/models/mapmodels/makke/coffee_mug/md2.cfg
diff --git a/packages/models/mapmodels/coffeemug/skin.jpg b/packages/models/mapmodels/makke/coffee_mug/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/coffeemug/skin.jpg
rename to packages/models/mapmodels/makke/coffee_mug/skin.jpg
diff --git a/packages/models/mapmodels/coffeemug/tris.md2 b/packages/models/mapmodels/makke/coffee_mug/tris.md2
similarity index 100%
rename from packages/models/mapmodels/coffeemug/tris.md2
rename to packages/models/mapmodels/makke/coffee_mug/tris.md2
diff --git a/packages/models/mapmodels/can2/md2.cfg b/packages/models/mapmodels/makke/coke_can/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/can2/md2.cfg
rename to packages/models/mapmodels/makke/coke_can/md2.cfg
diff --git a/packages/models/mapmodels/can/skin.jpg b/packages/models/mapmodels/makke/coke_can/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/can/skin.jpg
rename to packages/models/mapmodels/makke/coke_can/skin.jpg
diff --git a/packages/models/mapmodels/can/tris.md2 b/packages/models/mapmodels/makke/coke_can/tris.md2
similarity index 100%
rename from packages/models/mapmodels/can/tris.md2
rename to packages/models/mapmodels/makke/coke_can/tris.md2
diff --git a/packages/models/mapmodels/coffeemug/md2.cfg b/packages/models/mapmodels/makke/coke_can_fallen/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/coffeemug/md2.cfg
rename to packages/models/mapmodels/makke/coke_can_fallen/md2.cfg
diff --git a/packages/models/mapmodels/can2/skin.jpg b/packages/models/mapmodels/makke/coke_can_fallen/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/can2/skin.jpg
rename to packages/models/mapmodels/makke/coke_can_fallen/skin.jpg
diff --git a/packages/models/mapmodels/can2/tris.md2 b/packages/models/mapmodels/makke/coke_can_fallen/tris.md2
similarity index 100%
rename from packages/models/mapmodels/can2/tris.md2
rename to packages/models/mapmodels/makke/coke_can_fallen/tris.md2
diff --git a/packages/models/mapmodels/drainpipe/skin.jpg b/packages/models/mapmodels/makke/drainpipe/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/drainpipe/skin.jpg
rename to packages/models/mapmodels/makke/drainpipe/skin.jpg
diff --git a/packages/models/mapmodels/drainpipe/tris.md3 b/packages/models/mapmodels/makke/drainpipe/tris.md3
similarity index 100%
rename from packages/models/mapmodels/drainpipe/tris.md3
rename to packages/models/mapmodels/makke/drainpipe/tris.md3
diff --git a/packages/models/mapmodels/dumpster/md3.cfg b/packages/models/mapmodels/makke/dumpster/md3.cfg
similarity index 100%
rename from packages/models/mapmodels/dumpster/md3.cfg
rename to packages/models/mapmodels/makke/dumpster/md3.cfg
diff --git a/packages/models/mapmodels/dumpster/skin.jpg b/packages/models/mapmodels/makke/dumpster/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/dumpster/skin.jpg
rename to packages/models/mapmodels/makke/dumpster/skin.jpg
diff --git a/packages/models/mapmodels/dumpster/tris.md3 b/packages/models/mapmodels/makke/dumpster/tris.md3
similarity index 100%
rename from packages/models/mapmodels/dumpster/tris.md3
rename to packages/models/mapmodels/makke/dumpster/tris.md3
diff --git a/packages/models/mapmodels/elektro/skin.jpg b/packages/models/mapmodels/makke/electric_meter/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/elektro/skin.jpg
rename to packages/models/mapmodels/makke/electric_meter/skin.jpg
diff --git a/packages/models/mapmodels/elektro/tris.md3 b/packages/models/mapmodels/makke/electric_meter/tris.md3
similarity index 100%
rename from packages/models/mapmodels/elektro/tris.md3
rename to packages/models/mapmodels/makke/electric_meter/tris.md3
diff --git a/packages/models/mapmodels/bulb/skin.jpg b/packages/models/mapmodels/makke/lightbulb/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/bulb/skin.jpg
rename to packages/models/mapmodels/makke/lightbulb/skin.jpg
diff --git a/packages/models/mapmodels/bulb/tris.md2 b/packages/models/mapmodels/makke/lightbulb/tris.md2
similarity index 100%
rename from packages/models/mapmodels/bulb/tris.md2
rename to packages/models/mapmodels/makke/lightbulb/tris.md2
diff --git a/packages/models/mapmodels/chair1/md2.cfg b/packages/models/mapmodels/makke/office_chair/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/chair1/md2.cfg
rename to packages/models/mapmodels/makke/office_chair/md2.cfg
diff --git a/packages/models/mapmodels/chair1/skin.jpg b/packages/models/mapmodels/makke/office_chair/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/chair1/skin.jpg
rename to packages/models/mapmodels/makke/office_chair/skin.jpg
diff --git a/packages/models/mapmodels/chair1/tris.md2 b/packages/models/mapmodels/makke/office_chair/tris.md2
similarity index 100%
rename from packages/models/mapmodels/chair1/tris.md2
rename to packages/models/mapmodels/makke/office_chair/tris.md2
diff --git a/packages/models/mapmodels/europalette/md2.cfg b/packages/models/mapmodels/makke/pallet/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/europalette/md2.cfg
rename to packages/models/mapmodels/makke/pallet/md2.cfg
diff --git a/packages/models/mapmodels/europalette/skin.jpg b/packages/models/mapmodels/makke/pallet/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/europalette/skin.jpg
rename to packages/models/mapmodels/makke/pallet/skin.jpg
diff --git a/packages/models/mapmodels/europalette/tris.md2 b/packages/models/mapmodels/makke/pallet/tris.md2
similarity index 100%
rename from packages/models/mapmodels/europalette/tris.md2
rename to packages/models/mapmodels/makke/pallet/tris.md2
diff --git a/packages/models/mapmodels/bridge/md2.cfg b/packages/models/mapmodels/makke/platform/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/bridge/md2.cfg
rename to packages/models/mapmodels/makke/platform/md2.cfg
diff --git a/packages/models/mapmodels/bridge/skin.jpg b/packages/models/mapmodels/makke/platform/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/bridge/skin.jpg
rename to packages/models/mapmodels/makke/platform/skin.jpg
diff --git a/packages/models/mapmodels/bridge/tris.md2 b/packages/models/mapmodels/makke/platform/tris.md2
similarity index 100%
rename from packages/models/mapmodels/bridge/tris.md2
rename to packages/models/mapmodels/makke/platform/tris.md2
diff --git a/packages/models/mapmodels/comp_bridge/md2.cfg b/packages/models/mapmodels/makke/platform_bridge/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/comp_bridge/md2.cfg
rename to packages/models/mapmodels/makke/platform_bridge/md2.cfg
diff --git a/packages/models/mapmodels/comp_bridge/skin.jpg b/packages/models/mapmodels/makke/platform_bridge/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/comp_bridge/skin.jpg
rename to packages/models/mapmodels/makke/platform_bridge/skin.jpg
diff --git a/packages/models/mapmodels/comp_bridge/tris.md2 b/packages/models/mapmodels/makke/platform_bridge/tris.md2
similarity index 100%
rename from packages/models/mapmodels/comp_bridge/tris.md2
rename to packages/models/mapmodels/makke/platform_bridge/tris.md2
diff --git a/packages/models/mapmodels/bridge_shine/md2.cfg b/packages/models/mapmodels/makke/platform_shine/md2.cfg
similarity index 100%
rename from packages/models/mapmodels/bridge_shine/md2.cfg
rename to packages/models/mapmodels/makke/platform_shine/md2.cfg
diff --git a/packages/models/mapmodels/bridge_shine/skin.jpg b/packages/models/mapmodels/makke/platform_shine/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/bridge_shine/skin.jpg
rename to packages/models/mapmodels/makke/platform_shine/skin.jpg
diff --git a/packages/models/mapmodels/bridge_shine/tris.md2 b/packages/models/mapmodels/makke/platform_shine/tris.md2
similarity index 100%
rename from packages/models/mapmodels/bridge_shine/tris.md2
rename to packages/models/mapmodels/makke/platform_shine/tris.md2