diff --git a/packages/models/pickups/akimbo/akimbo.md3 b/packages/models/pickups/akimbo/akimbo.md3
new file mode 100644
index 00000000..5979fceb
Binary files /dev/null and b/packages/models/pickups/akimbo/akimbo.md3 differ
diff --git a/packages/models/pickups/akimbo/md3.cfg b/packages/models/pickups/akimbo/md3.cfg
new file mode 100644
index 00000000..dc9079b2
--- /dev/null
+++ b/packages/models/pickups/akimbo/md3.cfg
@@ -0,0 +1,3 @@
+md3load akimbo.md3
+md3skin akimbo skin.jpg
+mdlshadowdist 8
diff --git a/packages/models/pickups/akimbo/tris.md2 b/packages/models/pickups/akimbo/tris.md2
deleted file mode 100644
index 19a46249..00000000
Binary files a/packages/models/pickups/akimbo/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/ammobox/ammobox.md3 b/packages/models/pickups/ammobox/ammobox.md3
new file mode 100644
index 00000000..5fea98ed
Binary files /dev/null and b/packages/models/pickups/ammobox/ammobox.md3 differ
diff --git a/packages/models/pickups/ammobox/md3.cfg b/packages/models/pickups/ammobox/md3.cfg
new file mode 100644
index 00000000..43f21a65
--- /dev/null
+++ b/packages/models/pickups/ammobox/md3.cfg
@@ -0,0 +1,3 @@
+md3load ammobox.md3
+md3skin ammobox skin.jpg
+mdlshadowdist 8
\ No newline at end of file
diff --git a/packages/models/pickups/ammobox/tris.md2 b/packages/models/pickups/ammobox/tris.md2
deleted file mode 100644
index 78c57a34..00000000
Binary files a/packages/models/pickups/ammobox/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/flags/CLA/CLA.jpg b/packages/models/pickups/flags/CLA/CLA.jpg
new file mode 100644
index 00000000..483413d6
Binary files /dev/null and b/packages/models/pickups/flags/CLA/CLA.jpg differ
diff --git a/packages/models/pickups/flags/CLA/md3.cfg b/packages/models/pickups/flags/CLA/md3.cfg
deleted file mode 100644
index 27f36645..00000000
--- a/packages/models/pickups/flags/CLA/md3.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-md3load tris.md3
-md3skin mesh skin.jpg
-md3anim flag 0 7
\ No newline at end of file
diff --git a/packages/models/pickups/flags/CLA/skin.jpg b/packages/models/pickups/flags/CLA/skin.jpg
deleted file mode 100644
index 125bf308..00000000
Binary files a/packages/models/pickups/flags/CLA/skin.jpg and /dev/null differ
diff --git a/packages/models/pickups/flags/CLA/tris.md3 b/packages/models/pickups/flags/CLA/tris.md3
deleted file mode 100644
index b4849f30..00000000
Binary files a/packages/models/pickups/flags/CLA/tris.md3 and /dev/null differ
diff --git a/packages/models/pickups/flags/CLA_htf/md3.cfg b/packages/models/pickups/flags/CLA_htf/md3.cfg
index 27f36645..2bea9c75 100644
--- a/packages/models/pickups/flags/CLA_htf/md3.cfg
+++ b/packages/models/pickups/flags/CLA_htf/md3.cfg
@@ -1,3 +1,3 @@
-md3load tris.md3
-md3skin mesh skin.jpg
+md3load tris.md3
+md3skin mesh ../CLA/CLA.jpg
 md3anim flag 0 7
\ No newline at end of file
diff --git a/packages/models/pickups/flags/CLA_htf/skin.jpg b/packages/models/pickups/flags/CLA_htf/skin.jpg
deleted file mode 100755
index a9fc7a6a..00000000
Binary files a/packages/models/pickups/flags/CLA_htf/skin.jpg and /dev/null differ
diff --git a/packages/models/pickups/flags/RVSF/RVSF.jpg b/packages/models/pickups/flags/RVSF/RVSF.jpg
new file mode 100644
index 00000000..65cebe46
Binary files /dev/null and b/packages/models/pickups/flags/RVSF/RVSF.jpg differ
diff --git a/packages/models/pickups/flags/RVSF/md3.cfg b/packages/models/pickups/flags/RVSF/md3.cfg
index 27f36645..2edaccc0 100644
--- a/packages/models/pickups/flags/RVSF/md3.cfg
+++ b/packages/models/pickups/flags/RVSF/md3.cfg
@@ -1,3 +1,3 @@
-md3load tris.md3
-md3skin mesh skin.jpg
+md3load tris.md3
+md3skin mesh RVSF.jpg
 md3anim flag 0 7
\ No newline at end of file
diff --git a/packages/models/pickups/flags/RVSF/skin.jpg b/packages/models/pickups/flags/RVSF/skin.jpg
deleted file mode 100644
index 431ffe2a..00000000
Binary files a/packages/models/pickups/flags/RVSF/skin.jpg and /dev/null differ
diff --git a/packages/models/pickups/flags/RVSF_htf/md3.cfg b/packages/models/pickups/flags/RVSF_htf/md3.cfg
index 27f36645..47611940 100644
--- a/packages/models/pickups/flags/RVSF_htf/md3.cfg
+++ b/packages/models/pickups/flags/RVSF_htf/md3.cfg
@@ -1,3 +1,3 @@
-md3load tris.md3
-md3skin mesh skin.jpg
+md3load tris.md3
+md3skin mesh ../RVSF/RVSF.jpg
 md3anim flag 0 7
\ No newline at end of file
diff --git a/packages/models/pickups/flags/RVSF_htf/skin.jpg b/packages/models/pickups/flags/RVSF_htf/skin.jpg
deleted file mode 100755
index bc04eb1d..00000000
Binary files a/packages/models/pickups/flags/RVSF_htf/skin.jpg and /dev/null differ
diff --git a/packages/models/pickups/flags/small_CLA/md2.cfg b/packages/models/pickups/flags/small_CLA/md2.cfg
deleted file mode 100644
index 8185e92d..00000000
--- a/packages/models/pickups/flags/small_CLA/md2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mdlscale 60
-
diff --git a/packages/models/pickups/flags/small_CLA/md3.cfg b/packages/models/pickups/flags/small_CLA/md3.cfg
new file mode 100644
index 00000000..df11401b
--- /dev/null
+++ b/packages/models/pickups/flags/small_CLA/md3.cfg
@@ -0,0 +1,4 @@
+md3load tris.md3
+md3skin tris small_CLA.jpg
+mdlscale 60
+
diff --git a/packages/models/pickups/flags/small_CLA/skin.jpg b/packages/models/pickups/flags/small_CLA/skin.jpg
deleted file mode 100644
index d46223b6..00000000
Binary files a/packages/models/pickups/flags/small_CLA/skin.jpg and /dev/null differ
diff --git a/packages/models/pickups/flags/small_CLA_htf/skin.jpg b/packages/models/pickups/flags/small_CLA/small_CLA.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from packages/models/pickups/flags/small_CLA_htf/skin.jpg
rename to packages/models/pickups/flags/small_CLA/small_CLA.jpg
diff --git a/packages/models/pickups/flags/small_CLA/tris.md2 b/packages/models/pickups/flags/small_CLA/tris.md2
deleted file mode 100644
index 06256f47..00000000
Binary files a/packages/models/pickups/flags/small_CLA/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/flags/small_CLA/tris.md3 b/packages/models/pickups/flags/small_CLA/tris.md3
new file mode 100644
index 00000000..a77fc0ae
Binary files /dev/null and b/packages/models/pickups/flags/small_CLA/tris.md3 differ
diff --git a/packages/models/pickups/flags/small_CLA_htf/md2.cfg b/packages/models/pickups/flags/small_CLA_htf/md2.cfg
deleted file mode 100644
index 8185e92d..00000000
--- a/packages/models/pickups/flags/small_CLA_htf/md2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mdlscale 60
-
diff --git a/packages/models/pickups/flags/small_CLA_htf/md3.cfg b/packages/models/pickups/flags/small_CLA_htf/md3.cfg
new file mode 100644
index 00000000..77fd8d13
--- /dev/null
+++ b/packages/models/pickups/flags/small_CLA_htf/md3.cfg
@@ -0,0 +1,4 @@
+md3load tris.md3
+md3skin tris ../small_CLA/small_CLA.jpg
+mdlscale 60
+
diff --git a/packages/models/pickups/flags/small_CLA_htf/tris.md2 b/packages/models/pickups/flags/small_CLA_htf/tris.md2
deleted file mode 100644
index 06256f47..00000000
Binary files a/packages/models/pickups/flags/small_CLA_htf/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/flags/small_CLA_htf/tris.md3 b/packages/models/pickups/flags/small_CLA_htf/tris.md3
new file mode 100644
index 00000000..a77fc0ae
Binary files /dev/null and b/packages/models/pickups/flags/small_CLA_htf/tris.md3 differ
diff --git a/packages/models/pickups/flags/small_RVSF/md2.cfg b/packages/models/pickups/flags/small_RVSF/md2.cfg
deleted file mode 100644
index 8d01cf63..00000000
--- a/packages/models/pickups/flags/small_RVSF/md2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mdlscale 60
diff --git a/packages/models/pickups/flags/small_RVSF/md3.cfg b/packages/models/pickups/flags/small_RVSF/md3.cfg
new file mode 100644
index 00000000..4fdfb621
--- /dev/null
+++ b/packages/models/pickups/flags/small_RVSF/md3.cfg
@@ -0,0 +1,3 @@
+md3load tris.md3
+md3skin tris small_RVSF.jpg
+mdlscale 60
diff --git a/packages/models/pickups/flags/small_RVSF/skin.jpg b/packages/models/pickups/flags/small_RVSF/small_RVSF.jpg
similarity index 100%
rename from packages/models/pickups/flags/small_RVSF/skin.jpg
rename to packages/models/pickups/flags/small_RVSF/small_RVSF.jpg
diff --git a/packages/models/pickups/flags/small_RVSF/tris.md2 b/packages/models/pickups/flags/small_RVSF/tris.md2
deleted file mode 100644
index 06256f47..00000000
Binary files a/packages/models/pickups/flags/small_RVSF/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/flags/small_RVSF/tris.md3 b/packages/models/pickups/flags/small_RVSF/tris.md3
new file mode 100644
index 00000000..a77fc0ae
Binary files /dev/null and b/packages/models/pickups/flags/small_RVSF/tris.md3 differ
diff --git a/packages/models/pickups/flags/small_RVSF_htf/md2.cfg b/packages/models/pickups/flags/small_RVSF_htf/md2.cfg
deleted file mode 100644
index 8d01cf63..00000000
--- a/packages/models/pickups/flags/small_RVSF_htf/md2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mdlscale 60
diff --git a/packages/models/pickups/flags/small_RVSF_htf/md3.cfg b/packages/models/pickups/flags/small_RVSF_htf/md3.cfg
new file mode 100644
index 00000000..b811dbfa
--- /dev/null
+++ b/packages/models/pickups/flags/small_RVSF_htf/md3.cfg
@@ -0,0 +1,3 @@
+md3load tris.md3
+md3skin tris ../small_RVSF/small_RVSF.jpg
+mdlscale 60
diff --git a/packages/models/pickups/flags/small_RVSF_htf/skin.jpg b/packages/models/pickups/flags/small_RVSF_htf/skin.jpg
deleted file mode 100755
index a3944dc9..00000000
Binary files a/packages/models/pickups/flags/small_RVSF_htf/skin.jpg and /dev/null differ
diff --git a/packages/models/pickups/flags/small_RVSF_htf/tris.md2 b/packages/models/pickups/flags/small_RVSF_htf/tris.md2
deleted file mode 100644
index 06256f47..00000000
Binary files a/packages/models/pickups/flags/small_RVSF_htf/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/flags/small_RVSF_htf/tris.md3 b/packages/models/pickups/flags/small_RVSF_htf/tris.md3
new file mode 100644
index 00000000..a77fc0ae
Binary files /dev/null and b/packages/models/pickups/flags/small_RVSF_htf/tris.md3 differ
diff --git a/packages/models/pickups/health/health.md3 b/packages/models/pickups/health/health.md3
new file mode 100644
index 00000000..e8f777a8
Binary files /dev/null and b/packages/models/pickups/health/health.md3 differ
diff --git a/packages/models/pickups/health/md3.cfg b/packages/models/pickups/health/md3.cfg
new file mode 100644
index 00000000..6477f5bc
--- /dev/null
+++ b/packages/models/pickups/health/md3.cfg
@@ -0,0 +1,3 @@
+md3load health.md3
+md3skin health skin.jpg
+mdlshadowdist 8
\ No newline at end of file
diff --git a/packages/models/pickups/health/tris.md2 b/packages/models/pickups/health/tris.md2
deleted file mode 100644
index 910a8dfc..00000000
Binary files a/packages/models/pickups/health/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/helmet/helmet.md3 b/packages/models/pickups/helmet/helmet.md3
new file mode 100644
index 00000000..22ab56e3
Binary files /dev/null and b/packages/models/pickups/helmet/helmet.md3 differ
diff --git a/packages/models/pickups/helmet/md2.cfg b/packages/models/pickups/helmet/md2.cfg
deleted file mode 100644
index e1f9f240..00000000
--- a/packages/models/pickups/helmet/md2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-mdltrans 0 0 -15
-mdlshadowdist 8
-
diff --git a/packages/models/pickups/helmet/md3.cfg b/packages/models/pickups/helmet/md3.cfg
new file mode 100644
index 00000000..114ea49e
--- /dev/null
+++ b/packages/models/pickups/helmet/md3.cfg
@@ -0,0 +1,5 @@
+md3load helmet.md3
+md3skin helmet skin.jpg
+mdltrans 0 0 -15
+mdlshadowdist 8
+
diff --git a/packages/models/pickups/helmet/tris.md2 b/packages/models/pickups/helmet/tris.md2
deleted file mode 100644
index 7541ff99..00000000
Binary files a/packages/models/pickups/helmet/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/kevlar/kevlar.md3 b/packages/models/pickups/kevlar/kevlar.md3
new file mode 100644
index 00000000..6f9a740a
Binary files /dev/null and b/packages/models/pickups/kevlar/kevlar.md3 differ
diff --git a/packages/models/pickups/kevlar/md3.cfg b/packages/models/pickups/kevlar/md3.cfg
new file mode 100644
index 00000000..8178ca25
--- /dev/null
+++ b/packages/models/pickups/kevlar/md3.cfg
@@ -0,0 +1,3 @@
+md3load kevlar.md3
+md3skin kevlar skin.jpg
+mdlshadowdist 8
\ No newline at end of file
diff --git a/packages/models/pickups/kevlar/tris.md2 b/packages/models/pickups/kevlar/tris.md2
deleted file mode 100644
index 61bcbcbf..00000000
Binary files a/packages/models/pickups/kevlar/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/md2.cfg b/packages/models/pickups/md2.cfg
deleted file mode 100644
index e5784a3c..00000000
--- a/packages/models/pickups/md2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mdlshadowdist 8
-
diff --git a/packages/models/pickups/nade/md3.cfg b/packages/models/pickups/nade/md3.cfg
new file mode 100644
index 00000000..bd55885e
--- /dev/null
+++ b/packages/models/pickups/nade/md3.cfg
@@ -0,0 +1,3 @@
+md3load nade.md3
+md3skin nade nade.jpg
+mdlshadowdist 8
\ No newline at end of file
diff --git a/packages/models/pickups/nade/skin.jpg b/packages/models/pickups/nade/nade.jpg
similarity index 100%
rename from packages/models/pickups/nade/skin.jpg
rename to packages/models/pickups/nade/nade.jpg
diff --git a/packages/models/pickups/nade/nade.md3 b/packages/models/pickups/nade/nade.md3
new file mode 100644
index 00000000..3c75f16d
Binary files /dev/null and b/packages/models/pickups/nade/nade.md3 differ
diff --git a/packages/models/pickups/nade/tris.md2 b/packages/models/pickups/nade/tris.md2
deleted file mode 100644
index f32f8ea3..00000000
Binary files a/packages/models/pickups/nade/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/nades/md3.cfg b/packages/models/pickups/nades/md3.cfg
new file mode 100644
index 00000000..295e1e9e
--- /dev/null
+++ b/packages/models/pickups/nades/md3.cfg
@@ -0,0 +1,3 @@
+md3load nades.md3
+md3skin nades ../nade/nade.jpg
+mdlshadowdist 8
\ No newline at end of file
diff --git a/packages/models/pickups/nades/nades.md3 b/packages/models/pickups/nades/nades.md3
new file mode 100644
index 00000000..f42e99ed
Binary files /dev/null and b/packages/models/pickups/nades/nades.md3 differ
diff --git a/packages/models/pickups/nades/skin.jpg b/packages/models/pickups/nades/skin.jpg
deleted file mode 100644
index 956d9b56..00000000
Binary files a/packages/models/pickups/nades/skin.jpg and /dev/null differ
diff --git a/packages/models/pickups/nades/tris.md2 b/packages/models/pickups/nades/tris.md2
deleted file mode 100644
index c2f2de5a..00000000
Binary files a/packages/models/pickups/nades/tris.md2 and /dev/null differ
diff --git a/packages/models/pickups/pistolclips/md3.cfg b/packages/models/pickups/pistolclips/md3.cfg
new file mode 100644
index 00000000..94ff8e26
--- /dev/null
+++ b/packages/models/pickups/pistolclips/md3.cfg
@@ -0,0 +1,3 @@
+md3load pistolclips.md3
+md3skin pistolclips skin.jpg
+mdlshadowdist 8
\ No newline at end of file
diff --git a/packages/models/pickups/pistolclips/pistolclips.md3 b/packages/models/pickups/pistolclips/pistolclips.md3
new file mode 100644
index 00000000..b048f934
Binary files /dev/null and b/packages/models/pickups/pistolclips/pistolclips.md3 differ
diff --git a/packages/models/pickups/pistolclips/tris.md2 b/packages/models/pickups/pistolclips/tris.md2
deleted file mode 100644
index 5bc1e259..00000000
Binary files a/packages/models/pickups/pistolclips/tris.md2 and /dev/null differ