diff --git a/packages/maps/official/ac_lainio.cgz b/packages/maps/official/ac_lainio.cgz
index 56b48cce..1354ef20 100644
Binary files a/packages/maps/official/ac_lainio.cgz and b/packages/maps/official/ac_lainio.cgz differ
diff --git a/packages/maps/official/ac_nocturne.cgz b/packages/maps/official/ac_nocturne.cgz
index b37e08a9..f0451494 100644
Binary files a/packages/maps/official/ac_nocturne.cgz and b/packages/maps/official/ac_nocturne.cgz differ
diff --git a/packages/maps/official/ac_stellar.cgz b/packages/maps/official/ac_stellar.cgz
index 0b14c915..56b48cce 100644
Binary files a/packages/maps/official/ac_stellar.cgz and b/packages/maps/official/ac_stellar.cgz differ
diff --git a/packages/models/mapmodels/beerbottle/beerbottle2/skin.jpg b/packages/models/mapmodels/beerbottle/beerbottle2/skin.jpg
deleted file mode 100644
index 001ee5fb..00000000
Binary files a/packages/models/mapmodels/beerbottle/beerbottle2/skin.jpg and /dev/null differ
diff --git a/packages/models/mapmodels/sitters/ton/down/md2.cfg b/packages/models/mapmodels/sitters/ton/down/md2.cfg
new file mode 100644
index 00000000..84409827
--- /dev/null
+++ b/packages/models/mapmodels/sitters/ton/down/md2.cfg
@@ -0,0 +1,5 @@
+mdlscale 147
+mdlattribute keywords "litter"
+mdlattribute desc "Beer barrel, knocked over"
+mdlattribute author sitters
+mdlattribute distribution official
diff --git a/packages/models/mapmodels/ton/down/skin.jpg b/packages/models/mapmodels/sitters/ton/down/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/ton/down/skin.jpg
rename to packages/models/mapmodels/sitters/ton/down/skin.jpg
diff --git a/packages/models/mapmodels/ton/down/tris.md2 b/packages/models/mapmodels/sitters/ton/down/tris.md2
similarity index 100%
rename from packages/models/mapmodels/ton/down/tris.md2
rename to packages/models/mapmodels/sitters/ton/down/tris.md2
diff --git a/packages/models/mapmodels/ton/License.txt b/packages/models/mapmodels/sitters/ton/license.txt
similarity index 100%
rename from packages/models/mapmodels/ton/License.txt
rename to packages/models/mapmodels/sitters/ton/license.txt
diff --git a/packages/models/mapmodels/sitters/ton/up/md2.cfg b/packages/models/mapmodels/sitters/ton/up/md2.cfg
new file mode 100644
index 00000000..48f04b5d
--- /dev/null
+++ b/packages/models/mapmodels/sitters/ton/up/md2.cfg
@@ -0,0 +1,5 @@
+mdlscale 147
+mdlattribute keywords "litter"
+mdlattribute desc "Beer barrel"
+mdlattribute author sitters
+mdlattribute distribution official
diff --git a/packages/models/mapmodels/ton/skin.jpg b/packages/models/mapmodels/sitters/ton/up/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/ton/skin.jpg
rename to packages/models/mapmodels/sitters/ton/up/skin.jpg
diff --git a/packages/models/mapmodels/ton/tris.md2 b/packages/models/mapmodels/sitters/ton/up/tris.md2
similarity index 100%
rename from packages/models/mapmodels/ton/tris.md2
rename to packages/models/mapmodels/sitters/ton/up/tris.md2
diff --git a/packages/models/mapmodels/sunnyd/beerbottle/down/md3.cfg b/packages/models/mapmodels/sunnyd/beerbottle/down/md3.cfg
new file mode 100644
index 00000000..3da806c6
--- /dev/null
+++ b/packages/models/mapmodels/sunnyd/beerbottle/down/md3.cfg
@@ -0,0 +1,6 @@
+md3load tris.md3
+md3skin * ../skin.jpg
+mdlattribute keywords "litter"
+mdlattribute desc "Beer bottle, fallen"
+mdlattribute author sunnyd
+mdlattribute distribution official
diff --git a/packages/models/mapmodels/beerbottle/beerbottle2/tris.md3 b/packages/models/mapmodels/sunnyd/beerbottle/down/tris.md3
similarity index 100%
rename from packages/models/mapmodels/beerbottle/beerbottle2/tris.md3
rename to packages/models/mapmodels/sunnyd/beerbottle/down/tris.md3
diff --git a/packages/models/mapmodels/sunnyd/beerbottle/license.txt b/packages/models/mapmodels/sunnyd/beerbottle/license.txt
new file mode 100644
index 00000000..7c4af495
--- /dev/null
+++ b/packages/models/mapmodels/sunnyd/beerbottle/license.txt
@@ -0,0 +1,56 @@
+MAPMODEL
+===========
+"beer bottle" modelled and skinned by sunnyd.
+
+
+LICENSE
+===========
+Files in this folder and subfolders:
+
+by "sunnyd"
+sunnydowner@live.com
+2008
+
+
+
+===================================================================================================
+These files have been licensed under a the
+"Creative Commons Deed / Attribution Non-commercial Share-Alike ( at-nc-sa )" 
+===================================================================================================
+
+You are free:
+
+    * to copy, distribute, display, and perform the work
+    * to make derivative works
+
+Under the following conditions:
+
+"by" 	
+     -Attribution. You must give the original author credit.
+"nc"	
+     -Non-Commercial. You may not use this work for commercial purposes.
+"sa" 	
+     -Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting          work only under a licence identical to this one.
+
+    * For any reuse or distribution, you must make clear to others the licence terms of this work.
+    * Any of these conditions can be waived if you get permission from the copyright holder.
+
+Your fair use and other rights are in no way affected by the above.
+
+This is a human-readable summary of the Legal Code (the full licence).
+
+=====================================================================================================
+
+See:
+
+http://creativecommons.org/licenses/by-nc-sa/2.5/deed.en_GB
+
+for the original "human readable" document.
+
+http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
+
+for the full legal code. 
+
+visit creativecommons.org for general information and translations of the above documents. 
+
+=====================================================================================================
\ No newline at end of file
diff --git a/packages/models/mapmodels/beerbottle/beerbottle1/skin.jpg b/packages/models/mapmodels/sunnyd/beerbottle/skin.jpg
similarity index 100%
rename from packages/models/mapmodels/beerbottle/beerbottle1/skin.jpg
rename to packages/models/mapmodels/sunnyd/beerbottle/skin.jpg
diff --git a/packages/models/mapmodels/sunnyd/beerbottle/up/md3.cfg b/packages/models/mapmodels/sunnyd/beerbottle/up/md3.cfg
new file mode 100644
index 00000000..88998949
--- /dev/null
+++ b/packages/models/mapmodels/sunnyd/beerbottle/up/md3.cfg
@@ -0,0 +1,6 @@
+md3load tris.md3
+md3skin * ../skin.jpg
+mdlattribute keywords "litter"
+mdlattribute desc "Beer bottle"
+mdlattribute author sunnyd
+mdlattribute distribution official
diff --git a/packages/models/mapmodels/beerbottle/beerbottle1/tris.md3 b/packages/models/mapmodels/sunnyd/beerbottle/up/tris.md3
similarity index 100%
rename from packages/models/mapmodels/beerbottle/beerbottle1/tris.md3
rename to packages/models/mapmodels/sunnyd/beerbottle/up/tris.md3
diff --git a/packages/models/mapmodels/ton/down/md2.cfg b/packages/models/mapmodels/ton/down/md2.cfg
deleted file mode 100644
index 0f21e39c..00000000
--- a/packages/models/mapmodels/ton/down/md2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mdlscale 147
\ No newline at end of file
diff --git a/packages/models/mapmodels/ton/md2.cfg b/packages/models/mapmodels/ton/md2.cfg
deleted file mode 100644
index 0f21e39c..00000000
--- a/packages/models/mapmodels/ton/md2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mdlscale 147
\ No newline at end of file
diff --git a/packages/models/mapmodels/ton/up/License.txt b/packages/models/mapmodels/ton/up/License.txt
deleted file mode 100644
index 84f85c0c..00000000
--- a/packages/models/mapmodels/ton/up/License.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-You may use all these objects for free.
-The 3D models have an licence under GNU and CC_attribution/by.
\ No newline at end of file
diff --git a/packages/models/mapmodels/ton/up/md2.cfg b/packages/models/mapmodels/ton/up/md2.cfg
deleted file mode 100644
index 0f21e39c..00000000
--- a/packages/models/mapmodels/ton/up/md2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mdlscale 147
\ No newline at end of file
diff --git a/packages/models/mapmodels/ton/up/skin.jpg b/packages/models/mapmodels/ton/up/skin.jpg
deleted file mode 100644
index e850ec6f..00000000
Binary files a/packages/models/mapmodels/ton/up/skin.jpg and /dev/null differ
diff --git a/packages/models/mapmodels/ton/up/tris.md2 b/packages/models/mapmodels/ton/up/tris.md2
deleted file mode 100644
index 27d8403b..00000000
Binary files a/packages/models/mapmodels/ton/up/tris.md2 and /dev/null differ