diff --git a/app/Game/Config/ItemSettings.js b/app/Game/Config/ItemSettings.js
new file mode 100644
index 0000000..e2a0897
--- /dev/null
+++ b/app/Game/Config/ItemSettings.js
@@ -0,0 +1,356 @@
+define(function() {
+
+ var ItemSettings = {
+
+ "Default":
+ {
+ "category": "",
+ "image": "",
+
+ "type": "rectangle",
+ "weight": "2.5",
+ "width": "25",
+ "height": "25",
+
+ "rotation": "0",
+ "bounce": "0",
+ "grabAngle": "-1.5",
+ "danger": "1",
+ "bodyType": "dynamic",
+ },
+
+ "RagDoll":
+ {
+ "category": "graveyard",
+ "image": "chest.png",
+
+ "type": "ragdoll",
+ "weight": "5",
+ "width": "6",
+ "height": "12",
+
+ "bounce": "4",
+ "grabAngle": "-0.5",
+ "danger": "1",
+ },
+
+ "Knife":
+ {
+ "category": "kitchen",
+ "image": "knife.gif",
+
+ "weight": "1.5",
+ "width": "4",
+ "height": "15",
+
+ "grabAngle": "0.3",
+ "danger": "3",
+ },
+
+ "Large Knife":
+ {
+ "category": "kitchen",
+ "image": "knife_big.gif",
+
+ "weight": "2.2",
+ "width": "4",
+ "height": "23",
+
+ "grabAngle": "0.3",
+ "danger": "3",
+ },
+
+ "Small Cleaver":
+ {
+ "category": "kitchen",
+ "image": "cleaver_small.gif",
+
+ "weight": "2",
+ "width": "6",
+ "height": "17",
+
+ "grabAngle": "0.3",
+ "danger": "3",
+ },
+
+ "Large Cleaver":
+ {
+ "category": "kitchen",
+ "image": "cleaver_large.gif",
+
+ "weight": "3",
+ "width": "8",
+ "height": "22",
+
+ "grabAngle": "0.3",
+ "danger": "3",
+ },
+
+ "Herb Chopper":
+ {
+ "category": "kitchen",
+ "image": "herb_chopper.gif",
+
+ "weight": "1.1",
+ "width": "9",
+ "height": "7",
+
+ "grabAngle": "0.3",
+ "danger": "2.6",
+ },
+
+ "Fork": {
+ "category": "kitchen",
+ "image": "fork.gif",
+
+ "weight": "1.5",
+ "width": "5",
+ "height": "16",
+
+ "grabAngle": "0.3",
+ "danger": "1.8",
+ },
+
+ "Meat Fork": {
+ "category": "kitchen",
+ "image": "fork_meat.gif",
+
+ "weight": "2",
+ "width": "3",
+ "height": "22",
+
+ "grabAngle": "0.3",
+ "danger": "1.9",
+ },
+
+ "Spoon": {
+ "category": "kitchen",
+ "image": "spoon.gif",
+
+ "weight": "2",
+ "width": "4",
+ "height": "21",
+
+ "grabAngle": "0.3",
+ "danger": "1.1",
+ },
+
+ "Plate": {
+ "category": "kitchen",
+ "image": "plate.gif",
+
+ "type": "circle",
+ "weight": "1.9",
+ "width": "13",
+ "height": "13",
+
+ "grabAngle": "0",
+ },
+
+ "Cup": {
+ "category": "kitchen",
+ "image": "cup.gif",
+
+ "weight": "1.1",
+ "width": "8",
+ "height": "8",
+
+ "grabAngle": "-0.3",
+ },
+
+ "Can":
+ {
+ "category": "kitchen",
+ "image": "can.gif",
+
+ "weight": "1",
+ "width": "4",
+ "height": "7",
+
+ "grabAngle": "-0.1",
+ "bounce": "2",
+ },
+
+ "Rolling Pin":
+ {
+ "category": "kitchen",
+ "image": "rolling_pin.gif",
+
+ "weight": "1.3",
+ "width": "6",
+ "height": "26",
+
+ "grabAngle": "0.3",
+ },
+
+ "Pan":
+ {
+ "category": "kitchen",
+ "image": "pan.gif",
+
+ "weight": "1.4",
+ "width": "14",
+ "height": "8",
+
+ "grabAngle": "0.3",
+ },
+
+ "Refridgerator":
+ {
+ "category": "kitchen",
+ "image": "fridge.gif",
+
+ "weight": "10",
+ "width": "31",
+ "height": "53",
+
+ "bounce": "0",
+ "grabAngle": "-0.5",
+ },
+
+ "Microwave":
+ {
+ "category": "kitchen",
+ "image": "microwave.gif",
+
+ "weight": "3.6",
+ "width": "19",
+ "height": "12",
+
+ "grabAngle": "-0.1",
+ },
+
+ "Coffeemachine":
+ {
+ "category": "kitchen",
+ "image": "coffeemachine.gif",
+
+ "weight": "2.4",
+ "width": "11",
+ "height": "14",
+ },
+
+ "Toaster":
+ {
+ "category": "kitchen",
+ "image": "toaster.gif",
+
+ "weight": "1.9",
+ "width": "15",
+ "height": "9",
+ },
+
+ "Banana":
+ {
+ "category": "kitchen",
+ "image": "banana.gif",
+
+ "weight": "1",
+ "width": "5",
+ "height": "9",
+
+ "grabAngle": "0.5",
+ },
+
+ "Tomato":
+ {
+ "category": "kitchen",
+ "image": "tomato.gif",
+
+ "type": "circle",
+ "weight": "1",
+ "width": "8",
+ "height": "9",
+
+ "grabAngle": "-0.3",
+ },
+
+ "Football":
+ {
+ "category": "outdoor",
+ "image": "football.gif",
+
+ "type": "circle",
+ "weight": "2",
+ "width": "10",
+ "height": "10",
+
+ "bounce": "6",
+ },
+
+ "Skateboard":
+ {
+ "category": "outdoor",
+ "image": "skateboard.gif",
+
+ "type": "skateboard",
+ "weight": "1.5",
+ "width": "26",
+ "height": "6",
+
+ "grabAngle": "-1.5",
+ },
+
+ "Laundry Machine":
+ {
+ "category": "laundry",
+ "image": "laundry_machine.gif",
+
+ "weight": "10",
+ "width": "24",
+ "height": "31",
+
+ "grabAngle": "-0.5",
+ },
+
+ "Laundry Powder":
+ {
+ "category": "laundry",
+ "image": "laundry_powder.gif",
+
+ "weight": "2",
+ "width": "11",
+ "height": "13",
+
+ "grabAngle": "-0.2",
+ },
+
+ "Bible":
+ {
+ "category": "livingroom",
+ "image": "book_bible.gif",
+
+ "weight": "1.5",
+ "width": "11",
+ "height": "14",
+
+ "grabAngle": "-0.2",
+ },
+
+ "Television":
+ {
+ "category": "livingroom",
+ "image": "television.gif",
+
+ "weight": "7",
+ "width": "24",
+ "height": "21",
+
+ "grabAngle": "-0.4",
+ },
+
+ "TV Cabinet":
+ {
+ "category": "livingroom",
+ "image": "telly_cabinet.gif",
+
+ "weight": "5",
+ "width": "24",
+ "height": "17",
+
+ "grabAngle": "-0.4",
+ },
+ }
+
+ return ItemSettings;
+});
\ No newline at end of file
diff --git a/static/objects/rube/knife b/static/items/rube/knife
similarity index 100%
rename from static/objects/rube/knife
rename to static/items/rube/knife
diff --git a/static/objects/rube/knife-backups/knife-scriptLog.rs b/static/items/rube/knife-backups/knife-scriptLog.rs
similarity index 100%
rename from static/objects/rube/knife-backups/knife-scriptLog.rs
rename to static/items/rube/knife-backups/knife-scriptLog.rs
diff --git a/static/objects/rube/knife.json b/static/items/rube/knife.json
similarity index 100%
rename from static/objects/rube/knife.json
rename to static/items/rube/knife.json
diff --git a/static/objects/rube/ragdoll.cpp b/static/items/rube/ragdoll.cpp
similarity index 100%
rename from static/objects/rube/ragdoll.cpp
rename to static/items/rube/ragdoll.cpp
diff --git a/static/objects/rube/ragdoll.json b/static/items/rube/ragdoll.json
similarity index 100%
rename from static/objects/rube/ragdoll.json
rename to static/items/rube/ragdoll.json
diff --git a/static/objects/rube/ragdoll.rube b/static/items/rube/ragdoll.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube
rename to static/items/rube/ragdoll.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140215-200702.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140215-200702.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140215-200702.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140215-200702.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201149.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140215-201149.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201149.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140215-201149.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201320.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140215-201320.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201320.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140215-201320.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201604.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140215-201604.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201604.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140215-201604.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201620.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140215-201620.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201620.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140215-201620.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201650.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140215-201650.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201650.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140215-201650.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201704.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140215-201704.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201704.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140215-201704.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201732.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140215-201732.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140215-201732.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140215-201732.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140215-202928.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140215-202928.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140215-202928.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140215-202928.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll-140216-210150.rube b/static/items/rube/ragdoll.rube-backups/ragdoll-140216-210150.rube
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll-140216-210150.rube
rename to static/items/rube/ragdoll.rube-backups/ragdoll-140216-210150.rube
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140215-202955.rs b/static/items/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140215-202955.rs
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140215-202955.rs
rename to static/items/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140215-202955.rs
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140216-204730.rs b/static/items/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140216-204730.rs
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140216-204730.rs
rename to static/items/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140216-204730.rs
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140216-215910.rs b/static/items/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140216-215910.rs
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140216-215910.rs
rename to static/items/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog-140216-215910.rs
diff --git a/static/objects/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog.rs b/static/items/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog.rs
similarity index 100%
rename from static/objects/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog.rs
rename to static/items/rube/ragdoll.rube-backups/ragdoll.rube-scriptLog.rs
diff --git a/static/maps/tiled/debug.tmx b/static/maps/tiled/debug.tmx
deleted file mode 100644
index 17a1c1f..0000000
--- a/static/maps/tiled/debug.tmx
+++ /dev/null
@@ -1,856 +0,0 @@
-
-
diff --git a/static/maps/tiled/stones.tmx b/static/maps/tiled/stones.tmx
deleted file mode 100644
index c006355..0000000
--- a/static/maps/tiled/stones.tmx
+++ /dev/null
@@ -1,766 +0,0 @@
-
-
diff --git a/static/maps/tiled/stones2.tmx b/static/maps/tiled/stones2.tmx
deleted file mode 100644
index 27b6c2b..0000000
--- a/static/maps/tiled/stones2.tmx
+++ /dev/null
@@ -1,820 +0,0 @@
-
-