diff --git a/Resources/Prototypes/1_Temperature.yml b/Resources/Prototypes/1_Temperature.yml
index 8e60b57706..700550c5b6 100644
--- a/Resources/Prototypes/1_Temperature.yml
+++ b/Resources/Prototypes/1_Temperature.yml
@@ -4,10 +4,10 @@
   components:
   - type: Clickable
   - type: Sprite
-    texture: Objects/shoes.png
+    texture: Objects/Misc/shoes.png
 
   - type: Icon
-    texture: Objects/shoes.png
+    texture: Objects/Misc/shoes.png
 
   - type: Damageable
     resistanceset: Standard
diff --git a/Resources/Prototypes/Construction/machines.yml b/Resources/Prototypes/Construction/machines.yml
index 4312df1355..6425a5f04f 100644
--- a/Resources/Prototypes/Construction/machines.yml
+++ b/Resources/Prototypes/Construction/machines.yml
@@ -6,7 +6,7 @@
   description: A simple wall-mounted light fixture.
   placementmode: SnapgridBorder
   icon:
-    sprite: Objects/lighting.rsi
+    sprite: Objects/Lighting/lighting.rsi
     state: on
 
   result: poweredlight
@@ -14,13 +14,13 @@
   - material: Metal
     amount: 1
     icon:
-      sprite: Objects/lighting.rsi
+      sprite: Objects/Lighting/lighting.rsi
       state: construct
 
   - material: Cable
     amount: 1
     icon:
-      sprite: Objects/lighting.rsi
+      sprite: Objects/Lighting/lighting.rsi
       state: empty
 
   - material: Glass
diff --git a/Resources/Prototypes/Construction/power.yml b/Resources/Prototypes/Construction/power.yml
index f216d05411..3b87b8b84a 100644
--- a/Resources/Prototypes/Construction/power.yml
+++ b/Resources/Prototypes/Construction/power.yml
@@ -25,12 +25,12 @@
   category: Machines/Power
   placementmode: SnapgridCenter
   description: A portable generator capable of producing power from thin air.
-  icon: Objects/generator.png
+  icon: Objects/Power/generator.png
   result: Generator
   steps:
   - material: Metal
     amount: 2
-    icon: Objects/generator.png
+    icon: Objects/Power/generator.png
 
   - material: Cable
     amount: 2
@@ -54,4 +54,3 @@
 
   - material: Cable
     amount: 2
-
diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml
index 7db146628b..75622bbf9a 100644
--- a/Resources/Prototypes/Construction/structures.yml
+++ b/Resources/Prototypes/Construction/structures.yml
@@ -25,7 +25,7 @@
   name: Table
   id: table
   category: Structures
-  icon: Objects/worktop_single.png
+  icon: Objects/Furniture/worktop_single.png
   result: table
   placementmode: SnapgridCenter
   steps:
diff --git a/Resources/Prototypes/Construction/weapons.yml b/Resources/Prototypes/Construction/weapons.yml
index 93bcb674ca..8c985cc808 100644
--- a/Resources/Prototypes/Construction/weapons.yml
+++ b/Resources/Prototypes/Construction/weapons.yml
@@ -4,7 +4,7 @@
   category: Items/Weapons
   keywords: [melee]
   description: A crude spear for when you need to put holes in somebody.
-  icon: Objects/spear.png
+  icon: Objects/Melee/spear.rsi/spear.png
   objecttype: Item
   steps:
   - material: Metal
diff --git a/Resources/Prototypes/Entities/Janitor.yml b/Resources/Prototypes/Entities/Janitor.yml
index 1e6f53880f..f6f6297e4d 100644
--- a/Resources/Prototypes/Entities/Janitor.yml
+++ b/Resources/Prototypes/Entities/Janitor.yml
@@ -2,12 +2,12 @@
   parent: ReagentItem
   name: "Extra-Grip™ Mop"
   id: MopItem
-  description: A mop that cant be stopped, viscera cleanup detail awaits.
+  description: A mop that can't be stopped, viscera cleanup detail awaits.
   components:
   - type: Sprite
-    texture: Objects/mop.png
+    texture: Objects/Janitorial/mop.png
   - type: Icon
-    texture: Objects/mop.png
+    texture: Objects/Janitorial/mop.png
   - type: Item
     Size: 10
   - type: Solution
@@ -21,14 +21,14 @@
   description: Holds water and the tears of the janitor.
   components:
   - type: Sprite
-    texture: Objects/mopbucket.png
+    texture: Objects/Janitorial/mopbucket.png
   - type: Icon
-    texture: Objects/mopbucket.png
+    texture: Objects/Janitorial/mopbucket.png
   - type: Clickable
   - type: Solution
     maxVol: 500
     caps: 3
-    
+
 - type: entity
   parent: ReagentItem
   name: Bucket
@@ -36,10 +36,9 @@
   description: "It's a bucket."
   components:
   - type: Sprite
-    texture: Objects/bucket.png
+    texture: Objects/Janitorial/bucket.png
   - type: Icon
-    texture: Objects/bucket.png
+    texture: Objects/Janitorial/bucket.png
   - type: Solution
     maxVol: 500
     caps: 3
-    
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml b/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml
index 7f01f05263..6da20a4e5c 100644
--- a/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml
+++ b/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml
@@ -6,22 +6,22 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/laser_retro.rsi
+    sprite: Objects/Guns/Laser/laser_retro.rsi
     state: laser_retro_100
   - type: Icon
-    sprite: Objects/laser_retro.rsi
+    sprite: Objects/Guns/Laser/laser_retro.rsi
     state: laser_retro_100
   - type: RangedWeapon
   - type: HitscanWeapon
     damage: 30
-    fireSprite: "Objects/laser.png"
+    fireSprite: "Objects/Projectiles/laser.png"
     fireSound: "/Audio/Guns/Gunshots/laser.ogg"
     lowerDischargeLimit: 10
   - type: HitscanWeaponCapacitor
     capacity: 1200
   - type: Item
     Size: 24
-    sprite: Objects/laser_retro.rsi
+    sprite: Objects/Guns/Laser/laser_retro.rsi
     prefix: laser_retro_100
   - type: Appearance
     visuals:
@@ -37,23 +37,23 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/laser_cannon.rsi
+    sprite: Objects/Guns/Laser/laser_cannon.rsi
     state: laser_cannon_100
   - type: Icon
-    sprite: Objects/laser_cannon.rsi
+    sprite: Objects/Guns/Laser/laser_cannon.rsi
     state: laser_cannon_100
   - type: HitscanWeapon
     damage: 90
-    fireSprite: "Objects/heavylaser.png"
+    fireSprite: "Objects/Projectiles/heavylaser.png"
     fireSound: "/Audio/Guns/Gunshots/laser_cannon.ogg"
     lowerDischargeLimit: 10
   - type: HitscanWeaponCapacitor
     capacity: 2400
   - type: Item
     Size: 32
-    sprite: Objects/laser_cannon.rsi
+    sprite: Objects/Guns/Laser/laser_cannon.rsi
     prefix: laser_cannon_100
   - type: Appearance
     visuals:
     - type: HitscanWeaponVisualizer2D
-      prefix: laser_cannon
\ No newline at end of file
+      prefix: laser_cannon
diff --git a/Resources/Prototypes/Entities/items/bike_horn.yml b/Resources/Prototypes/Entities/items/bike_horn.yml
index f5f8c1fa34..1320f2b012 100644
--- a/Resources/Prototypes/Entities/items/bike_horn.yml
+++ b/Resources/Prototypes/Entities/items/bike_horn.yml
@@ -5,16 +5,16 @@
   description: A horn off of a bicycle.
   components:
   - type: Sprite
-    sprite: Objects/bikehorn.rsi
+    sprite: Objects/Fun/bikehorn.rsi
     state: icon
 
   - type: Icon
-    sprite: Objects/bikehorn.rsi
+    sprite: Objects/Fun/bikehorn.rsi
     state: icon
 
   - type: Item
     Size: 5
-    sprite: Objects/bikehorn.rsi
+    sprite: Objects/Fun/bikehorn.rsi
 
   - type: Sound
   - type: EmitSoundOnUse
diff --git a/Resources/Prototypes/Entities/items/dice.yml b/Resources/Prototypes/Entities/items/dice.yml
index 2955754c89..f160d2fc0e 100644
--- a/Resources/Prototypes/Entities/items/dice.yml
+++ b/Resources/Prototypes/Entities/items/dice.yml
@@ -15,10 +15,10 @@
     sides: 100
     step: 10
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d100100
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d100100
 
 - type: entity
@@ -29,12 +29,12 @@
   - type: Dice
     sides: 20
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d2020
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d2020
-    
+
 - type: entity
   name: "d12"
   parent: BaseDice
@@ -43,12 +43,12 @@
   - type: Dice
     sides: 12
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d1212
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d1212
-    
+
 - type: entity
   name: "d10"
   parent: BaseDice
@@ -57,12 +57,12 @@
   - type: Dice
     sides: 10
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d1010
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d1010
-    
+
 - type: entity
   name: "d8"
   parent: BaseDice
@@ -71,12 +71,12 @@
   - type: Dice
     sides: 8
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d88
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d88
-    
+
 - type: entity
   name: "d6"
   parent: BaseDice
@@ -85,12 +85,12 @@
   - type: Dice
     sides: 6
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d66
   - type: Icon
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d66
-    
+
 - type: entity
   name: "d4"
   parent: BaseDice
@@ -99,8 +99,8 @@
   - type: Dice
     sides: 4
   - type: Sprite
-    sprite: Objects/items/dice.rsi
+    sprite: Objects/Fun/dice.rsi
     state: d44
   - type: Icon
-    sprite: Objects/items/dice.rsi
-    state: d44
\ No newline at end of file
+    sprite: Objects/Fun/dice.rsi
+    state: d44
diff --git a/Resources/Prototypes/Entities/items/explosives.yml b/Resources/Prototypes/Entities/items/explosives.yml
index e7b379e5b9..15767b1bb0 100644
--- a/Resources/Prototypes/Entities/items/explosives.yml
+++ b/Resources/Prototypes/Entities/items/explosives.yml
@@ -5,13 +5,13 @@
   id: ExGrenade
   components:
   - type: Sprite
-    sprite: Objects/grenade.rsi
+    sprite: Objects/Grenades/grenade.rsi
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
 
   - type: Icon
-    sprite: Objects/grenade.rsi
+    sprite: Objects/Grenades/grenade.rsi
     state: icon
 
   - type: Item
@@ -29,7 +29,7 @@
   - type: Damageable
   - type: Destructible
     thresholdvalue: 10
-    
+
   - type: Appearance
     visuals:
     - type: TimerTriggerVisualizer2D
@@ -42,13 +42,13 @@
   id: SyndieMiniBomb
   components:
   - type: Sprite
-    sprite: Objects/syndgrenade.rsi
+    sprite: Objects/Grenades/syndgrenade.rsi
     layers:
     - state: icon
       map: ["enum.TriggerVisualLayers.Base"]
 
   - type: Icon
-    sprite: Objects/syndgrenade.rsi
+    sprite: Objects/Grenades/syndgrenade.rsi
     state: icon
 
   - type: Item
@@ -71,4 +71,3 @@
     visuals:
     - type: TimerTriggerVisualizer2D
       countdown_sound: /Audio/effects/countdown.ogg
-
diff --git a/Resources/Prototypes/Entities/items/fire_extinguisher.yml b/Resources/Prototypes/Entities/items/fire_extinguisher.yml
index 4a8a847631..44b619b6f6 100644
--- a/Resources/Prototypes/Entities/items/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/items/fire_extinguisher.yml
@@ -5,8 +5,8 @@
   description: Extinguishes fires.
   components:
   - type: Sprite
-    texture: Objects/fire_extinguisher.png
+    texture: Objects/Misc/fire_extinguisher.png
   - type: Icon
-    texture: Objects/fire_extinguisher.png
+    texture: Objects/Misc/fire_extinguisher.png
   - type: Item
     Size: 10
diff --git a/Resources/Prototypes/Entities/items/flashlight.yml b/Resources/Prototypes/Entities/items/flashlight.yml
index 886dd4cf51..a3ac37a74f 100644
--- a/Resources/Prototypes/Entities/items/flashlight.yml
+++ b/Resources/Prototypes/Entities/items/flashlight.yml
@@ -6,14 +6,14 @@
   components:
   - type: HandheldLight
   - type: Sprite
-    sprite: Objects/lantern.rsi
+    sprite: Objects/Tools/flashlight.rsi
     layers:
     - state: lantern_off
     - state: HandheldLightOnOverlay
       shader: unshaded
       visible: false
   - type: Icon
-    sprite: Objects/lantern.rsi
+    sprite: Objects/Tools/flashlight.rsi
     state: lantern_off
   - type: PointLight
     enabled: false
diff --git a/Resources/Prototypes/Entities/items/light_bulb.yml b/Resources/Prototypes/Entities/items/light_bulb.yml
index fb6dadc64a..0a4a75db4d 100644
--- a/Resources/Prototypes/Entities/items/light_bulb.yml
+++ b/Resources/Prototypes/Entities/items/light_bulb.yml
@@ -7,11 +7,11 @@
     bulb: Bulb
 
   - type: Sprite
-    sprite: Objects/light_bulb.rsi
+    sprite: Objects/Lighting/light_bulb.rsi
     state: normal
 
   - type: Icon
-    sprite: Objects/light_bulb.rsi
+    sprite: Objects/Lighting/light_bulb.rsi
     state: normal
 
 - type: entity
@@ -30,11 +30,11 @@
     bulb: Tube
 
   - type: Sprite
-    sprite: Objects/light_tube.rsi
+    sprite: Objects/Lighting/light_tube.rsi
     state: normal
 
   - type: Icon
-    sprite: Objects/light_tube.rsi
+    sprite: Objects/Lighting/light_tube.rsi
     state: normal
 
 - type: entity
@@ -48,9 +48,8 @@
     BurningTemperature: 350
     PowerUse: 9
   - type: Sprite
-    sprite: Objects/light_tube.rsi
+    sprite: Objects/Lighting/light_tube.rsi
     state: normal
   - type: Icon
-    sprite: Objects/light_tube.rsi
+    sprite: Objects/Lighting/light_tube.rsi
     state: normal
-
diff --git a/Resources/Prototypes/Entities/items/materials.yml b/Resources/Prototypes/Entities/items/materials.yml
index 339438e937..29a546e890 100644
--- a/Resources/Prototypes/Entities/items/materials.yml
+++ b/Resources/Prototypes/Entities/items/materials.yml
@@ -18,9 +18,9 @@
   - type: Stack
     stacktype: enum.StackType.Metal
   - type: Sprite
-    texture: Objects/sheet_metal.png
+    texture: Objects/Materials/sheet_metal.png
   - type: Icon
-    texture: Objects/sheet_metal.png
+    texture: Objects/Materials/sheet_metal.png
 
 - type: entity
   id: SteelSheet1
@@ -42,10 +42,10 @@
   - type: Stack
     stacktype: enum.StackType.Glass
   - type: Sprite
-    texture: Objects/sheet_glass.png
+    texture: Objects/Materials/sheet_glass.png
   - type: Icon
-    texture: Objects/sheet_glass.png
-    
+    texture: Objects/Materials/sheet_glass.png
+
 - type: entity
   id: GlassSheet1
   name: Glass Sheet 1
@@ -62,8 +62,8 @@
   - type: Stack
     stacktype: enum.StackType.Cable
   - type: Sprite
-    texture: Objects/cable_coil.png
+    texture: Objects/Tools/cable_coil.png
     color: red
   - type: Icon
-    texture: Objects/cable_coil.png
+    texture: Objects/Tools/cable_coil.png
   - type: WirePlacer
diff --git a/Resources/Prototypes/Entities/items/medical.yml b/Resources/Prototypes/Entities/items/medical.yml
index 2130d81646..fde973dc85 100644
--- a/Resources/Prototypes/Entities/items/medical.yml
+++ b/Resources/Prototypes/Entities/items/medical.yml
@@ -4,9 +4,9 @@
   id: Medkit
   components:
   - type: Sprite
-    texture: Objects/medkit_r.png
+    texture: Objects/Medical/medkit_r.png
   - type: Icon
-    texture: Objects/medkit_r.png
+    texture: Objects/Medical/medkit_r.png
   - type: Healing
     heal: 100
     damage: Brute
@@ -30,9 +30,9 @@
   id: Ointment
   components:
   - type: Sprite
-    texture: Objects/ointment.png
+    texture: Objects/Medical/ointment.png
   - type: Icon
-    texture: Objects/ointment.png
+    texture: Objects/Medical/ointment.png
   - type: Healing
     heal: 10
     damage: Heat
@@ -49,9 +49,9 @@
   id: Brutepack
   components:
   - type: Sprite
-    texture: Objects/brutepack.png
+    texture: Objects/Medical/brutepack.png
   - type: Icon
-    texture: Objects/brutepack.png
+    texture: Objects/Medical/brutepack.png
   - type: Healing
     heal: 10
     damage: Brute
diff --git a/Resources/Prototypes/Entities/items/powercells.yml b/Resources/Prototypes/Entities/items/powercells.yml
index 39afa131b3..a1a3de21dd 100644
--- a/Resources/Prototypes/Entities/items/powercells.yml
+++ b/Resources/Prototypes/Entities/items/powercells.yml
@@ -18,11 +18,11 @@
   parent: PowerCellSmallBase
   components:
   - type: Sprite
-    sprite: Objects/PowerCells/power_cell_small_st.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_st.rsi
     layers:
     - state: s_st
   - type: Icon
-    sprite: Objects/PowerCells/power_cell_small_st.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_st.rsi
     state: s_st
   - type: PowerCell
     capacity: 1500
@@ -39,11 +39,11 @@
   parent: PowerCellSmallBase
   components:
   - type: Sprite
-    sprite: Objects/PowerCells/power_cell_small_hi.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_hi.rsi
     layers:
     - state: s_hi
   - type: Icon
-    sprite: Objects/PowerCells/power_cell_small_hi.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_hi.rsi
     state: s_hi
   - type: PowerCell
     capacity: 3000
@@ -60,11 +60,11 @@
   parent: PowerCellSmallBase
   components:
   - type: Sprite
-    sprite: Objects/PowerCells/power_cell_small_sup.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_sup.rsi
     layers:
     - state: s_sup
   - type: Icon
-    sprite: Objects/PowerCells/power_cell_small_sup.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_sup.rsi
     state: s_sup
   - type: PowerCell
     capacity: 6000
@@ -81,11 +81,11 @@
   parent: PowerCellSmallBase
   components:
   - type: Sprite
-    sprite: Objects/PowerCells/power_cell_small_hy.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_hy.rsi
     layers:
     - state: s_hy
   - type: Icon
-    sprite: Objects/PowerCells/power_cell_small_hy.rsi
+    sprite: Objects/Power/PowerCells/power_cell_small_hy.rsi
     state: s_hy
   - type: PowerCell
     capacity: 10000
diff --git a/Resources/Prototypes/Entities/items/table_parts.yml b/Resources/Prototypes/Entities/items/table_parts.yml
index 88a59b2705..ca95909b86 100644
--- a/Resources/Prototypes/Entities/items/table_parts.yml
+++ b/Resources/Prototypes/Entities/items/table_parts.yml
@@ -5,13 +5,13 @@
   description: Parts of a table.
   components:
   - type: Sprite
-    sprite: Objects/table_parts.rsi
+    sprite: Objects/Parts/table_parts.rsi
     state: icon
 
   - type: Icon
-    sprite: Objects/table_parts.rsi
+    sprite: Objects/Parts/table_parts.rsi
     state: icon
 
   - type: Item
     Size: 25
-    sprite: Objects/table_parts.rsi
+    sprite: Objects/Parts/table_parts.rsi
diff --git a/Resources/Prototypes/Entities/items/teleporters.yml b/Resources/Prototypes/Entities/items/teleporters.yml
index f73c3e8cb9..b4aaca6a6c 100644
--- a/Resources/Prototypes/Entities/items/teleporters.yml
+++ b/Resources/Prototypes/Entities/items/teleporters.yml
@@ -5,16 +5,16 @@
   components:
   - type: Sprite
     netsync: false
-    sprite: Objects/hand_tele.rsi
+    sprite: Objects/Misc/hand_tele.rsi
     state: ready
   - type: Icon
-    sprite: Objects/hand_tele.rsi
+    sprite: Objects/Misc/hand_tele.rsi
     state: ready
   - type: ItemTeleporter
     teleporter_type: Random
   - type: Item
     Size: 12
-    sprite: Objects/hand_tele.rsi
+    sprite: Objects/Misc/hand_tele.rsi
   - type: Sound
   - type: Appearance
     visuals:
@@ -60,4 +60,4 @@
     state: portal-pending
   - type: Appearance
     visuals:
-    - type: PortalVisualizer2D
\ No newline at end of file
+    - type: PortalVisualizer2D
diff --git a/Resources/Prototypes/Entities/items/toolbox.yml b/Resources/Prototypes/Entities/items/toolbox.yml
index 8516602a9c..63d20fcd60 100644
--- a/Resources/Prototypes/Entities/items/toolbox.yml
+++ b/Resources/Prototypes/Entities/items/toolbox.yml
@@ -2,12 +2,12 @@
   name: Emergency Toolbox
   parent: BaseItem
   id: RedToolboxItem
-  description: A shiny red and robust container
+  description: A bright red toolbox, stocked with emergency tools
   components:
   - type: Sprite
-    texture: Objects/toolbox_r.png
+    texture: Objects/Tools/toolbox_r.png
   - type: Icon
-    texture: Objects/toolbox_r.png
+    texture: Objects/Tools/toolbox_r.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -17,12 +17,12 @@
   name: Mechanical Toolbox
   parent: BaseItem
   id: BlueToolboxItem
-  description: A blue box, not the kind you're thinking of
+  description: A blue box, stocked with mechanical tools
   components:
   - type: Sprite
-    texture: Objects/Toolbox_b.png
+    texture: Objects/Tools/Toolbox_b.png
   - type: Icon
-    texture: Objects/Toolbox_b.png
+    texture: Objects/Tools/Toolbox_b.png
   - type: Storage
     Capacity: 60
   - type: Item
@@ -35,9 +35,9 @@
   description: A toolbox typically stocked with electrical gear
   components:
   - type: Sprite
-    texture: Objects/Toolbox_y.png
+    texture: Objects/Tools/Toolbox_y.png
   - type: Icon
-    texture: Objects/Toolbox_y.png
+    texture: Objects/Tools/Toolbox_y.png
   - type: Storage
     Capacity: 60
   - type: Item
diff --git a/Resources/Prototypes/Entities/items/tools.yml b/Resources/Prototypes/Entities/items/tools.yml
index 5cb15603d3..3fcf365ccf 100644
--- a/Resources/Prototypes/Entities/items/tools.yml
+++ b/Resources/Prototypes/Entities/items/tools.yml
@@ -6,9 +6,9 @@
   components:
   - type: Wirecutter
   - type: Sprite
-    texture: Objects/wirecutter.png
+    texture: Objects/Tools/wirecutter.png
   - type: Icon
-    texture: Objects/wirecutter.png
+    texture: Objects/Tools/wirecutter.png
   - type: MeleeWeapon
 
 - type: entity
@@ -19,9 +19,9 @@
   components:
   - type: Screwdriver
   - type: Sprite
-    texture: Objects/screwdriver.png
+    texture: Objects/Tools/screwdriver.png
   - type: Icon
-    texture: Objects/screwdriver.png
+    texture: Objects/Tools/screwdriver.png
   - type: MeleeWeapon
 
 - type: entity
@@ -32,7 +32,7 @@
   components:
   - type: Welder
   - type: Sprite
-    sprite: Objects/tools.rsi
+    sprite: Objects/Tools/welder.rsi
     layers:
     - state: welder
     - state: welder_flame
@@ -40,7 +40,7 @@
       visible: false
 
   - type: Icon
-    sprite: Objects/tools.rsi
+    sprite: Objects/Tools/welder.rsi
     state: welder
   - type: MeleeWeapon
 
@@ -52,9 +52,9 @@
   components:
   - type: Wrench
   - type: Sprite
-    texture: Objects/wrench.png
+    texture: Objects/Tools/wrench.png
   - type: Icon
-    texture: Objects/wrench.png
+    texture: Objects/Tools/wrench.png
   - type: MeleeWeapon
 
 - type: entity
@@ -65,9 +65,9 @@
   components:
   - type: Crowbar
   - type: Sprite
-    texture: Objects/crowbar.png
+    texture: Objects/Tools/crowbar.png
   - type: Icon
-    texture: Objects/crowbar.png
+    texture: Objects/Tools/crowbar.png
   - type: MeleeWeapon
 
 - type: entity
@@ -78,7 +78,7 @@
   components:
   - type: Multitool
   - type: Sprite
-    texture: Objects/multitool.png
+    texture: Objects/Tools/multitool.png
   - type: Icon
-    texture: Objects/multitool.png
+    texture: Objects/Tools/multitool.png
   - type: PowerDebugTool
diff --git a/Resources/Prototypes/Entities/items/weapons/kitchen.yml b/Resources/Prototypes/Entities/items/weapons/kitchen.yml
index 8bdedc6ffe..25995043f1 100644
--- a/Resources/Prototypes/Entities/items/weapons/kitchen.yml
+++ b/Resources/Prototypes/Entities/items/weapons/kitchen.yml
@@ -5,16 +5,16 @@
   desc: A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products.
   components:
   - type: Sprite
-    sprite: Objects/items/cleaver.rsi
+    sprite: Objects/Melee/cleaver.rsi
     size: 4
     state: butch
 
   - type: Icon
-    sprite: Objects/items/cleaver.rsi
+    sprite: Objects/Melee/cleaver.rsi
     state: butch
 
   - type: MeleeWeapon
   - type: Item
     Size: 10
-    sprite: Objects/items/cleaver.rsi
+    sprite: Objects/Melee/cleaver.rsi
     prefix: inhand
diff --git a/Resources/Prototypes/Entities/items/weapons/mining.yml b/Resources/Prototypes/Entities/items/weapons/mining.yml
index daaf29cacd..5349a7b471 100644
--- a/Resources/Prototypes/Entities/items/weapons/mining.yml
+++ b/Resources/Prototypes/Entities/items/weapons/mining.yml
@@ -4,17 +4,17 @@
   id: Pickaxe
   components:
   - type: Sprite
-    sprite: Objects/items/pickaxe.rsi
+    sprite: Objects/Melee/pickaxe.rsi
     state: pickaxe
 
   - type: Icon
-    sprite: Objects/items/pickaxe.rsi
+    sprite: Objects/Melee/pickaxe.rsi
     state: pickaxe
   - type: Pickaxe
   - type: MeleeWeapon
     damage: 25
   - type: Item
     Size: 24
-    sprite: Objects/items/pickaxe.rsi
+    sprite: Objects/Melee/pickaxe.rsi
     prefix: inhand
   - type: Sound
diff --git a/Resources/Prototypes/Entities/items/weapons/spear.yml b/Resources/Prototypes/Entities/items/weapons/spear.yml
index ac57358c87..c820c7273d 100644
--- a/Resources/Prototypes/Entities/items/weapons/spear.yml
+++ b/Resources/Prototypes/Entities/items/weapons/spear.yml
@@ -4,15 +4,15 @@
   id: Spear
   components:
   - type: Sprite
-    sprite: Objects/items/spear.rsi
+    sprite: Objects/Melee/spear.rsi
     state: spear
 
   - type: Icon
-    sprite: Objects/items/spear.rsi
+    sprite: Objects/Melee/spear.rsi
     state: spear
 
   - type: MeleeWeapon
   - type: Item
     Size: 24
-    sprite: Objects/items/spear.rsi
+    sprite: Objects/Melee/spear.rsi
     prefix: inhand
diff --git a/Resources/Prototypes/LatheRecipes/medical.yml b/Resources/Prototypes/LatheRecipes/medical.yml
index a79746fc8e..939144a024 100644
--- a/Resources/Prototypes/LatheRecipes/medical.yml
+++ b/Resources/Prototypes/LatheRecipes/medical.yml
@@ -1,17 +1,17 @@
 - type: latheRecipe
   id: Brutepack
-  icon: Objects/brutepack.png
+  icon: Objects/Medical/brutepack.png
   result: Brutepack
   completetime: 500
   materials:
     steel: 400
     glass: 125
-    
+
 - type: latheRecipe
   id: Ointment
-  icon: Objects/ointment.png
+  icon: Objects/Medical/ointment.png
   result: Ointment
   completetime: 500
   materials:
     steel: 400
-    glass: 125
\ No newline at end of file
+    glass: 125
diff --git a/Resources/Prototypes/LatheRecipes/misc.yml b/Resources/Prototypes/LatheRecipes/misc.yml
index e27cc5404d..f2ab94f12a 100644
--- a/Resources/Prototypes/LatheRecipes/misc.yml
+++ b/Resources/Prototypes/LatheRecipes/misc.yml
@@ -1,17 +1,17 @@
 - type: latheRecipe
   id: LightTube
-  icon: Objects/light_tube.rsi/normal.png
+  icon: Objects/Lighting/light_tube.rsi/normal.png
   result: LightTube
   completetime: 500
   materials:
     steel: 60
     glass: 100
-    
+
 - type: latheRecipe
   id: LightBulb
-  icon: Objects/light_bulb.rsi/normal.png
+  icon: Objects/Lighting/light_bulb.rsi/normal.png
   result: LightBulb
   completetime: 500
   materials:
     steel: 30
-    glass: 50
\ No newline at end of file
+    glass: 50
diff --git a/Resources/Prototypes/LatheRecipes/sheet.yml b/Resources/Prototypes/LatheRecipes/sheet.yml
index ccb97f0262..a65816b4b7 100644
--- a/Resources/Prototypes/LatheRecipes/sheet.yml
+++ b/Resources/Prototypes/LatheRecipes/sheet.yml
@@ -1,15 +1,15 @@
 - type: latheRecipe
   id: MetalStack
-  icon: Objects/sheet_metal.png
+  icon: Objects/Materials/sheet_metal.png
   result: SteelSheet1
   completetime: 500
   materials:
     steel: 3750
-    
+
 - type: latheRecipe
   id: GlassStack
-  icon: Objects/sheet_glass.png
+  icon: Objects/Materials/sheet_glass.png
   result: GlassSheet1
   completetime: 500
   materials:
-    glass: 3750
\ No newline at end of file
+    glass: 3750
diff --git a/Resources/Prototypes/LatheRecipes/tools.yml b/Resources/Prototypes/LatheRecipes/tools.yml
index 93ba2040b6..0480b2cb24 100644
--- a/Resources/Prototypes/LatheRecipes/tools.yml
+++ b/Resources/Prototypes/LatheRecipes/tools.yml
@@ -1,6 +1,6 @@
 - type: latheRecipe
   id: Wirecutter
-  icon: Objects/wirecutter.png
+  icon: Objects/Tools/wirecutter.png
   result: Wirecutter
   completetime: 500
   materials:
@@ -8,7 +8,7 @@
 
 - type: latheRecipe
   id: Screwdriver
-  icon: Objects/screwdriver.png
+  icon: Objects/Tools/screwdriver.png
   result: Screwdriver
   completetime: 500
   materials:
@@ -16,44 +16,44 @@
 
 - type: latheRecipe
   id: Welder
-  icon: Objects/welder.png
+  icon: Objects/Tools/autolathe_welder.png
   result: Welder
   completetime: 500
   materials:
     steel: 70
     glass: 30
-    
+
 - type: latheRecipe
   id: Wrench
-  icon: Objects/wrench.png
+  icon: Objects/Tools/wrench.png
   result: Wrench
   completetime: 500
   materials:
     steel: 70
     glass: 30
-    
+
 - type: latheRecipe
   id: CableStack
-  icon: Objects/cable_coil.png
+  icon: Objects/Tools/cable_coil.png
   result: CableStack
   completetime: 500
   materials:
     steel: 50
     glass: 50
-    
+
 - type: latheRecipe
   id: Crowbar
-  icon: Objects/crowbar.png
+  icon: Objects/Tools/crowbar.png
   result: Crowbar
   completetime: 500
   materials:
     steel: 50
-        
+
 - type: latheRecipe
   id: Multitool
-  icon: Objects/multitool.png
+  icon: Objects/Tools/multitool.png
   result: Multitool
   completetime: 500
   materials:
     steel: 50
-    glass: 20
\ No newline at end of file
+    glass: 20
diff --git a/Resources/Prototypes/Technologies/sheet.yml b/Resources/Prototypes/Technologies/sheet.yml
deleted file mode 100644
index 8106312e76..0000000000
--- a/Resources/Prototypes/Technologies/sheet.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: technology
-  name: "Test Technology 1"
-  id: Parent1
-  description: Parent technology needed for sheets
-  icon: Objects/sheet_glass.png
-  requiredpoints: 5000
-  
-- type: technology
-  name: "Test Technology 2"
-  id: Parent2
-  description: Parent technology 2 needed for sheets
-  icon: Objects/sheet_glass.png
-  requiredpoints: 5000
-
-- type: technology
-  name: Material sheet printing
-  id: Sheets
-  description: Print those sheets!
-  icon: Objects/sheet_metal.png
-  requiredpoints: 500
-  requiredtechnologies:
-    - Parent1
-    - Parent2
-  unlockedrecipes:
-    - MetalStack
-    - GlassStack
\ No newline at end of file
diff --git a/Resources/Prototypes/Technologies/technologies.yml b/Resources/Prototypes/Technologies/technologies.yml
new file mode 100644
index 0000000000..2e91b8cf7e
--- /dev/null
+++ b/Resources/Prototypes/Technologies/technologies.yml
@@ -0,0 +1,78 @@
+# In order to make this list somewhat organized, please place new technologies underneath their overarching "base" technology.
+# The technology tree is using this layout - https://tgstation13.org/wiki//images/thumb/f/f4/ResearchTree.png/800px-ResearchTree.png
+
+# Base Technology
+
+- type: technology
+  name: "Basic Research Technology"
+  id: Base_1
+  description: Nanotransen basic research technologies.
+  icon: Buildings/research.rsi/server-on.png
+  requiredpoints: 250
+
+# Biological Technology Tree
+
+- type: technology
+  name: "Biological Technology"
+  id: Bio_Base_1
+  description: Investigations into the natural world.
+  icon: Buildings/plants.rsi/plant_1.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1
+
+# Data Theory Technology Tree
+
+- type: technology
+  name: "Data Theory"
+  id: Data_Base_1
+  description: Just like regular data, but in space!
+  icon: Buildings/computers.rsi/computer-datatheory.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1
+
+# Industrial Engineering Technology Tree
+
+  - type: technology
+  name: "Industrial Engineering"
+  id: Industrial_Base_1
+  description: A refresher course on modern engineering technology.
+  icon: Buildings/research.rsi/protolathe.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1
+
+  - type: technology
+  name: Material sheet printing
+  id: Sheets
+  description: Print those sheets!
+  icon: Objects/Materials/sheet_metal.png
+  requiredpoints: 250
+  requiredtechnologies:
+    - Industrial_Base_1
+  unlockedrecipes:
+    - MetalStack
+    - GlassStack
+
+# Electromagnetic Theory Technology Tree
+
+  - type: technology
+  name: "Electromagnetic Theory"
+  id: Electro_Base_1
+  description: Try not to fry yourself.
+  icon: Buildings/apc.rsi/apcwires.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1
+
+# Bluespace Theory Technology Tree
+
+  - type: technology
+  name: "Basic Bluespace Theory"
+  id: Bluespace_Base_1
+  description: An experimental course on the mysterious technology known as bluespace.
+  icon: Buildings/teleporters.rsi/teleporter-theory.png
+  requiredpoints: 1000
+  requiredtechnologies:
+    - Base_1
diff --git a/Resources/Prototypes/materials.yml b/Resources/Prototypes/materials.yml
index b95a13a0f0..3cc4ffdfcc 100644
--- a/Resources/Prototypes/materials.yml
+++ b/Resources/Prototypes/materials.yml
@@ -2,7 +2,7 @@
   id: steel
   name: Steel
   color: gray
-  icon: Objects/sheet_metal.png
+  icon: Objects/Materials/sheet_metal.png
   density: 7700
   electricresistivity: 6.9e-7
   thermalconductivity: 18
@@ -12,7 +12,7 @@
   id: glass
   name: Glass
   color: '#e8f0ff33'
-  icon: Objects/sheet_glass.png
+  icon: Objects/Materials/sheet_glass.png
   density: 2500
   electricresistivity: 1.0e+13
   thermalconductivity: 0.9
diff --git a/Resources/Textures/Buildings/computer.rsi/computer-datatheory.png b/Resources/Textures/Buildings/computer.rsi/computer-datatheory.png
new file mode 100644
index 0000000000..b4f5524513
Binary files /dev/null and b/Resources/Textures/Buildings/computer.rsi/computer-datatheory.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/meta.json b/Resources/Textures/Buildings/plants.rsi/meta.json
new file mode 100644
index 0000000000..5bd4e26562
--- /dev/null
+++ b/Resources/Textures/Buildings/plants.rsi/meta.json
@@ -0,0 +1,123 @@
+{
+    "version": 1,
+
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/plants.dmi and modified by Swept",
+
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "plant_1",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_2",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_3",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_4",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_5",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_6",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_7",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_8",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_9",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_10",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_11",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_12",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_13",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_14",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+        {
+            "name": "plant_15",
+            "select": [],
+            "flags": {},
+            "directions": 1,
+            "delays": []
+        },
+]
+}
+
+
+
+
+
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_1.png b/Resources/Textures/Buildings/plants.rsi/plant_1.png
new file mode 100644
index 0000000000..b54ab40685
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_1.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_10.png b/Resources/Textures/Buildings/plants.rsi/plant_10.png
new file mode 100644
index 0000000000..8791db6082
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_10.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_11.png b/Resources/Textures/Buildings/plants.rsi/plant_11.png
new file mode 100644
index 0000000000..694b8983b2
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_11.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_12.png b/Resources/Textures/Buildings/plants.rsi/plant_12.png
new file mode 100644
index 0000000000..ada681a748
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_12.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_13.png b/Resources/Textures/Buildings/plants.rsi/plant_13.png
new file mode 100644
index 0000000000..3192f154b8
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_13.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_14.png b/Resources/Textures/Buildings/plants.rsi/plant_14.png
new file mode 100644
index 0000000000..2818d3dcf3
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_14.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_15.png b/Resources/Textures/Buildings/plants.rsi/plant_15.png
new file mode 100644
index 0000000000..3d6c3f8700
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_15.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_2.png b/Resources/Textures/Buildings/plants.rsi/plant_2.png
new file mode 100644
index 0000000000..74d35c80a0
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_2.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_3.png b/Resources/Textures/Buildings/plants.rsi/plant_3.png
new file mode 100644
index 0000000000..d9049ac5f5
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_3.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_4.png b/Resources/Textures/Buildings/plants.rsi/plant_4.png
new file mode 100644
index 0000000000..ae64a1559c
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_4.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_5.png b/Resources/Textures/Buildings/plants.rsi/plant_5.png
new file mode 100644
index 0000000000..a60da141b2
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_5.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_6.png b/Resources/Textures/Buildings/plants.rsi/plant_6.png
new file mode 100644
index 0000000000..81d4d49610
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_6.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_7.png b/Resources/Textures/Buildings/plants.rsi/plant_7.png
new file mode 100644
index 0000000000..6d334b3c6a
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_7.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_8.png b/Resources/Textures/Buildings/plants.rsi/plant_8.png
new file mode 100644
index 0000000000..d78be07e14
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_8.png differ
diff --git a/Resources/Textures/Buildings/plants.rsi/plant_9.png b/Resources/Textures/Buildings/plants.rsi/plant_9.png
new file mode 100644
index 0000000000..ba5a910c47
Binary files /dev/null and b/Resources/Textures/Buildings/plants.rsi/plant_9.png differ
diff --git a/Resources/Textures/Objects/armour.png b/Resources/Textures/Objects/Armor/armour.png
similarity index 100%
rename from Resources/Textures/Objects/armour.png
rename to Resources/Textures/Objects/Armor/armour.png
diff --git a/Resources/Textures/Objects/backpack.png b/Resources/Textures/Objects/Backpacks/backpack.png
similarity index 100%
rename from Resources/Textures/Objects/backpack.png
rename to Resources/Textures/Objects/Backpacks/backpack.png
diff --git a/Resources/Textures/Objects/Drink/glass.png b/Resources/Textures/Objects/Drink/glass.png
new file mode 100644
index 0000000000..9a2ba75ac0
Binary files /dev/null and b/Resources/Textures/Objects/Drink/glass.png differ
diff --git a/Resources/Textures/Objects/Drink/glassofwater.png b/Resources/Textures/Objects/Drink/glassofwater.png
new file mode 100644
index 0000000000..64d5aef0f1
Binary files /dev/null and b/Resources/Textures/Objects/Drink/glassofwater.png differ
diff --git a/Resources/Textures/Objects/Drink/mugofcoffee.png b/Resources/Textures/Objects/Drink/mugofcoffee.png
new file mode 100644
index 0000000000..106e469eea
Binary files /dev/null and b/Resources/Textures/Objects/Drink/mugofcoffee.png differ
diff --git a/Resources/Textures/Objects/Drink/redbull.png b/Resources/Textures/Objects/Drink/redbull.png
new file mode 100644
index 0000000000..a80691add4
Binary files /dev/null and b/Resources/Textures/Objects/Drink/redbull.png differ
diff --git a/Resources/Textures/Objects/Drink/soda.png b/Resources/Textures/Objects/Drink/soda.png
new file mode 100644
index 0000000000..4e43fee396
Binary files /dev/null and b/Resources/Textures/Objects/Drink/soda.png differ
diff --git a/Resources/Textures/Objects/Drink/vodka.png b/Resources/Textures/Objects/Drink/vodka.png
new file mode 100644
index 0000000000..d66b6b8a0b
Binary files /dev/null and b/Resources/Textures/Objects/Drink/vodka.png differ
diff --git a/Resources/Textures/Objects/Drink/vodkaempty.png b/Resources/Textures/Objects/Drink/vodkaempty.png
new file mode 100644
index 0000000000..627182e93d
Binary files /dev/null and b/Resources/Textures/Objects/Drink/vodkaempty.png differ
diff --git a/Resources/Textures/Objects/Food/alienrawmeat.png b/Resources/Textures/Objects/Food/alienrawmeat.png
new file mode 100644
index 0000000000..12832ef5ed
Binary files /dev/null and b/Resources/Textures/Objects/Food/alienrawmeat.png differ
diff --git a/Resources/Textures/Objects/Food/burger.png b/Resources/Textures/Objects/Food/burger.png
new file mode 100644
index 0000000000..85356dcd5f
Binary files /dev/null and b/Resources/Textures/Objects/Food/burger.png differ
diff --git a/Resources/Textures/Objects/Food/cheesepizza.png b/Resources/Textures/Objects/Food/cheesepizza.png
new file mode 100644
index 0000000000..15c02aa3d4
Binary files /dev/null and b/Resources/Textures/Objects/Food/cheesepizza.png differ
diff --git a/Resources/Textures/Objects/Food/cheesepizzaslice.png b/Resources/Textures/Objects/Food/cheesepizzaslice.png
new file mode 100644
index 0000000000..515d3aaba9
Binary files /dev/null and b/Resources/Textures/Objects/Food/cheesepizzaslice.png differ
diff --git a/Resources/Textures/Objects/Food/creampie.png b/Resources/Textures/Objects/Food/creampie.png
new file mode 100644
index 0000000000..e6da814d4d
Binary files /dev/null and b/Resources/Textures/Objects/Food/creampie.png differ
diff --git a/Resources/Textures/Objects/Food/egg.png b/Resources/Textures/Objects/Food/egg.png
new file mode 100644
index 0000000000..03829c56ff
Binary files /dev/null and b/Resources/Textures/Objects/Food/egg.png differ
diff --git a/Resources/Textures/Objects/Food/emptypizzabox.png b/Resources/Textures/Objects/Food/emptypizzabox.png
new file mode 100644
index 0000000000..d344bfd735
Binary files /dev/null and b/Resources/Textures/Objects/Food/emptypizzabox.png differ
diff --git a/Resources/Textures/Objects/Food/emptyusedpizzabox.png b/Resources/Textures/Objects/Food/emptyusedpizzabox.png
new file mode 100644
index 0000000000..d19fb07c3d
Binary files /dev/null and b/Resources/Textures/Objects/Food/emptyusedpizzabox.png differ
diff --git a/Resources/Textures/Objects/Food/faggot.png b/Resources/Textures/Objects/Food/faggot.png
new file mode 100644
index 0000000000..51eae6691e
Binary files /dev/null and b/Resources/Textures/Objects/Food/faggot.png differ
diff --git a/Resources/Textures/Objects/Food/flourbag.png b/Resources/Textures/Objects/Food/flourbag.png
new file mode 100644
index 0000000000..0051992d4d
Binary files /dev/null and b/Resources/Textures/Objects/Food/flourbag.png differ
diff --git a/Resources/Textures/Objects/Food/frosteddonut.png b/Resources/Textures/Objects/Food/frosteddonut.png
new file mode 100644
index 0000000000..9902357801
Binary files /dev/null and b/Resources/Textures/Objects/Food/frosteddonut.png differ
diff --git a/Resources/Textures/Objects/Food/meatpizza.png b/Resources/Textures/Objects/Food/meatpizza.png
new file mode 100644
index 0000000000..e3e90b84c7
Binary files /dev/null and b/Resources/Textures/Objects/Food/meatpizza.png differ
diff --git a/Resources/Textures/Objects/Food/meatpizzaslice.png b/Resources/Textures/Objects/Food/meatpizzaslice.png
new file mode 100644
index 0000000000..4dae2ccdee
Binary files /dev/null and b/Resources/Textures/Objects/Food/meatpizzaslice.png differ
diff --git a/Resources/Textures/Objects/Food/milk.png b/Resources/Textures/Objects/Food/milk.png
new file mode 100644
index 0000000000..d51219b3da
Binary files /dev/null and b/Resources/Textures/Objects/Food/milk.png differ
diff --git a/Resources/Textures/Objects/Food/pizzabox.png b/Resources/Textures/Objects/Food/pizzabox.png
new file mode 100644
index 0000000000..fbdb3ecee2
Binary files /dev/null and b/Resources/Textures/Objects/Food/pizzabox.png differ
diff --git a/Resources/Textures/Objects/Food/plaindonut.png b/Resources/Textures/Objects/Food/plaindonut.png
new file mode 100644
index 0000000000..d6e246de0e
Binary files /dev/null and b/Resources/Textures/Objects/Food/plaindonut.png differ
diff --git a/Resources/Textures/Objects/Food/poisonrawmeat.png b/Resources/Textures/Objects/Food/poisonrawmeat.png
new file mode 100644
index 0000000000..7b4b0f8b7a
Binary files /dev/null and b/Resources/Textures/Objects/Food/poisonrawmeat.png differ
diff --git a/Resources/Textures/Objects/Food/rawmeat.png b/Resources/Textures/Objects/Food/rawmeat.png
new file mode 100644
index 0000000000..1507ff25b7
Binary files /dev/null and b/Resources/Textures/Objects/Food/rawmeat.png differ
diff --git a/Resources/Textures/Objects/Food/twinkie.png b/Resources/Textures/Objects/Food/twinkie.png
new file mode 100644
index 0000000000..9beedf980a
Binary files /dev/null and b/Resources/Textures/Objects/Food/twinkie.png differ
diff --git a/Resources/Textures/Objects/Fun/banana.png b/Resources/Textures/Objects/Fun/banana.png
new file mode 100644
index 0000000000..df4c416e95
Binary files /dev/null and b/Resources/Textures/Objects/Fun/banana.png differ
diff --git a/Resources/Textures/Objects/Fun/bananapeel.png b/Resources/Textures/Objects/Fun/bananapeel.png
new file mode 100644
index 0000000000..f2891d4268
Binary files /dev/null and b/Resources/Textures/Objects/Fun/bananapeel.png differ
diff --git a/Resources/Textures/Objects/bikehorn.rsi/icon.png b/Resources/Textures/Objects/Fun/bikehorn.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/bikehorn.rsi/icon.png
rename to Resources/Textures/Objects/Fun/bikehorn.rsi/icon.png
diff --git a/Resources/Textures/Objects/bikehorn.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/bikehorn.rsi/inhand-left.png
rename to Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/bikehorn.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/bikehorn.rsi/inhand-right.png
rename to Resources/Textures/Objects/Fun/bikehorn.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/bikehorn.rsi/meta.json b/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/bikehorn.rsi/meta.json
rename to Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json
diff --git a/Resources/Textures/Objects/items/dice.rsi/d10010.png b/Resources/Textures/Objects/Fun/dice.rsi/d10010.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d10010.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d10010.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d100100.png b/Resources/Textures/Objects/Fun/dice.rsi/d100100.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d100100.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d100100.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d10020.png b/Resources/Textures/Objects/Fun/dice.rsi/d10020.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d10020.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d10020.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d10030.png b/Resources/Textures/Objects/Fun/dice.rsi/d10030.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d10030.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d10030.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d10040.png b/Resources/Textures/Objects/Fun/dice.rsi/d10040.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d10040.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d10040.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d10050.png b/Resources/Textures/Objects/Fun/dice.rsi/d10050.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d10050.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d10050.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d10060.png b/Resources/Textures/Objects/Fun/dice.rsi/d10060.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d10060.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d10060.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d10070.png b/Resources/Textures/Objects/Fun/dice.rsi/d10070.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d10070.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d10070.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d10080.png b/Resources/Textures/Objects/Fun/dice.rsi/d10080.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d10080.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d10080.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d10090.png b/Resources/Textures/Objects/Fun/dice.rsi/d10090.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d10090.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d10090.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d101.png b/Resources/Textures/Objects/Fun/dice.rsi/d101.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d101.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d101.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d1010.png b/Resources/Textures/Objects/Fun/dice.rsi/d1010.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d1010.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d1010.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d102.png b/Resources/Textures/Objects/Fun/dice.rsi/d102.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d102.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d102.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d103.png b/Resources/Textures/Objects/Fun/dice.rsi/d103.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d103.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d103.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d104.png b/Resources/Textures/Objects/Fun/dice.rsi/d104.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d104.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d104.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d105.png b/Resources/Textures/Objects/Fun/dice.rsi/d105.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d105.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d105.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d106.png b/Resources/Textures/Objects/Fun/dice.rsi/d106.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d106.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d106.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d107.png b/Resources/Textures/Objects/Fun/dice.rsi/d107.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d107.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d107.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d108.png b/Resources/Textures/Objects/Fun/dice.rsi/d108.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d108.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d108.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d109.png b/Resources/Textures/Objects/Fun/dice.rsi/d109.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d109.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d109.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d121.png b/Resources/Textures/Objects/Fun/dice.rsi/d121.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d121.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d121.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d1210.png b/Resources/Textures/Objects/Fun/dice.rsi/d1210.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d1210.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d1210.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d1211.png b/Resources/Textures/Objects/Fun/dice.rsi/d1211.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d1211.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d1211.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d1212.png b/Resources/Textures/Objects/Fun/dice.rsi/d1212.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d1212.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d1212.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d122.png b/Resources/Textures/Objects/Fun/dice.rsi/d122.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d122.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d122.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d123.png b/Resources/Textures/Objects/Fun/dice.rsi/d123.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d123.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d123.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d124.png b/Resources/Textures/Objects/Fun/dice.rsi/d124.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d124.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d124.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d125.png b/Resources/Textures/Objects/Fun/dice.rsi/d125.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d125.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d125.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d126.png b/Resources/Textures/Objects/Fun/dice.rsi/d126.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d126.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d126.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d127.png b/Resources/Textures/Objects/Fun/dice.rsi/d127.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d127.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d127.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d128.png b/Resources/Textures/Objects/Fun/dice.rsi/d128.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d128.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d128.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d129.png b/Resources/Textures/Objects/Fun/dice.rsi/d129.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d129.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d129.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d201.png b/Resources/Textures/Objects/Fun/dice.rsi/d201.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d201.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d201.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2010.png b/Resources/Textures/Objects/Fun/dice.rsi/d2010.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2010.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2010.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2011.png b/Resources/Textures/Objects/Fun/dice.rsi/d2011.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2011.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2011.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2012.png b/Resources/Textures/Objects/Fun/dice.rsi/d2012.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2012.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2012.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2013.png b/Resources/Textures/Objects/Fun/dice.rsi/d2013.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2013.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2013.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2014.png b/Resources/Textures/Objects/Fun/dice.rsi/d2014.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2014.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2014.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2015.png b/Resources/Textures/Objects/Fun/dice.rsi/d2015.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2015.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2015.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2016.png b/Resources/Textures/Objects/Fun/dice.rsi/d2016.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2016.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2016.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2017.png b/Resources/Textures/Objects/Fun/dice.rsi/d2017.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2017.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2017.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2018.png b/Resources/Textures/Objects/Fun/dice.rsi/d2018.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2018.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2018.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2019.png b/Resources/Textures/Objects/Fun/dice.rsi/d2019.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2019.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2019.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d202.png b/Resources/Textures/Objects/Fun/dice.rsi/d202.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d202.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d202.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d2020.png b/Resources/Textures/Objects/Fun/dice.rsi/d2020.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d2020.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d2020.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d203.png b/Resources/Textures/Objects/Fun/dice.rsi/d203.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d203.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d203.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d204.png b/Resources/Textures/Objects/Fun/dice.rsi/d204.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d204.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d204.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d205.png b/Resources/Textures/Objects/Fun/dice.rsi/d205.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d205.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d205.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d206.png b/Resources/Textures/Objects/Fun/dice.rsi/d206.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d206.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d206.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d207.png b/Resources/Textures/Objects/Fun/dice.rsi/d207.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d207.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d207.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d208.png b/Resources/Textures/Objects/Fun/dice.rsi/d208.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d208.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d208.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d209.png b/Resources/Textures/Objects/Fun/dice.rsi/d209.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d209.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d209.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d41.png b/Resources/Textures/Objects/Fun/dice.rsi/d41.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d41.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d41.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d42.png b/Resources/Textures/Objects/Fun/dice.rsi/d42.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d42.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d42.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d43.png b/Resources/Textures/Objects/Fun/dice.rsi/d43.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d43.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d43.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d44.png b/Resources/Textures/Objects/Fun/dice.rsi/d44.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d44.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d44.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d61.png b/Resources/Textures/Objects/Fun/dice.rsi/d61.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d61.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d61.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d62.png b/Resources/Textures/Objects/Fun/dice.rsi/d62.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d62.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d62.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d63.png b/Resources/Textures/Objects/Fun/dice.rsi/d63.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d63.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d63.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d64.png b/Resources/Textures/Objects/Fun/dice.rsi/d64.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d64.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d64.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d65.png b/Resources/Textures/Objects/Fun/dice.rsi/d65.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d65.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d65.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d66.png b/Resources/Textures/Objects/Fun/dice.rsi/d66.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d66.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d66.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d81.png b/Resources/Textures/Objects/Fun/dice.rsi/d81.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d81.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d81.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d82.png b/Resources/Textures/Objects/Fun/dice.rsi/d82.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d82.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d82.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d83.png b/Resources/Textures/Objects/Fun/dice.rsi/d83.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d83.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d83.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d84.png b/Resources/Textures/Objects/Fun/dice.rsi/d84.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d84.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d84.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d85.png b/Resources/Textures/Objects/Fun/dice.rsi/d85.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d85.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d85.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d86.png b/Resources/Textures/Objects/Fun/dice.rsi/d86.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d86.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d86.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d87.png b/Resources/Textures/Objects/Fun/dice.rsi/d87.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d87.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d87.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/d88.png b/Resources/Textures/Objects/Fun/dice.rsi/d88.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/d88.png
rename to Resources/Textures/Objects/Fun/dice.rsi/d88.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/dicebag.png b/Resources/Textures/Objects/Fun/dice.rsi/dicebag.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/dicebag.png
rename to Resources/Textures/Objects/Fun/dice.rsi/dicebag.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/magicdicebag.png b/Resources/Textures/Objects/Fun/dice.rsi/magicdicebag.png
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/magicdicebag.png
rename to Resources/Textures/Objects/Fun/dice.rsi/magicdicebag.png
diff --git a/Resources/Textures/Objects/items/dice.rsi/meta.json b/Resources/Textures/Objects/Fun/dice.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/items/dice.rsi/meta.json
rename to Resources/Textures/Objects/Fun/dice.rsi/meta.json
diff --git a/Resources/Textures/Objects/door_ew.png b/Resources/Textures/Objects/Furniture/door_ew.png
similarity index 100%
rename from Resources/Textures/Objects/door_ew.png
rename to Resources/Textures/Objects/Furniture/door_ew.png
diff --git a/Resources/Textures/Objects/door_ewo.png b/Resources/Textures/Objects/Furniture/door_ewo.png
similarity index 100%
rename from Resources/Textures/Objects/door_ewo.png
rename to Resources/Textures/Objects/Furniture/door_ewo.png
diff --git a/Resources/Textures/Objects/wirelessmachine.png b/Resources/Textures/Objects/Furniture/wirelessmachine.png
similarity index 100%
rename from Resources/Textures/Objects/wirelessmachine.png
rename to Resources/Textures/Objects/Furniture/wirelessmachine.png
diff --git a/Resources/Textures/Objects/worktop_single.png b/Resources/Textures/Objects/Furniture/worktop_single.png
similarity index 100%
rename from Resources/Textures/Objects/worktop_single.png
rename to Resources/Textures/Objects/Furniture/worktop_single.png
diff --git a/Resources/Textures/Objects/grenade.rsi/icon.png b/Resources/Textures/Objects/Grenades/grenade.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/grenade.rsi/icon.png
rename to Resources/Textures/Objects/Grenades/grenade.rsi/icon.png
diff --git a/Resources/Textures/Objects/grenade.rsi/meta.json b/Resources/Textures/Objects/Grenades/grenade.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/grenade.rsi/meta.json
rename to Resources/Textures/Objects/Grenades/grenade.rsi/meta.json
diff --git a/Resources/Textures/Objects/grenade.rsi/primed.png b/Resources/Textures/Objects/Grenades/grenade.rsi/primed.png
similarity index 100%
rename from Resources/Textures/Objects/grenade.rsi/primed.png
rename to Resources/Textures/Objects/Grenades/grenade.rsi/primed.png
diff --git a/Resources/Textures/Objects/syndgrenade.rsi/icon.png b/Resources/Textures/Objects/Grenades/syndgrenade.rsi/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from Resources/Textures/Objects/syndgrenade.rsi/icon.png
rename to Resources/Textures/Objects/Grenades/syndgrenade.rsi/icon.png
diff --git a/Resources/Textures/Objects/syndgrenade.rsi/meta.json b/Resources/Textures/Objects/Grenades/syndgrenade.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/syndgrenade.rsi/meta.json
rename to Resources/Textures/Objects/Grenades/syndgrenade.rsi/meta.json
diff --git a/Resources/Textures/Objects/syndgrenade.rsi/primed.png b/Resources/Textures/Objects/Grenades/syndgrenade.rsi/primed.png
similarity index 100%
rename from Resources/Textures/Objects/syndgrenade.rsi/primed.png
rename to Resources/Textures/Objects/Grenades/syndgrenade.rsi/primed.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/0-inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/0-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/0-inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/0-inhand-left.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/0-inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/0-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/0-inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/0-inhand-right.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/25-inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/25-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/25-inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/25-inhand-left.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/25-inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/25-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/25-inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/25-inhand-right.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/50-inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/50-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/50-inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/50-inhand-left.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/50-inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/50-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/50-inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/50-inhand-right.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/75-inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/75-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/75-inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/75-inhand-left.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/75-inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/75-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/75-inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/75-inhand-right.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/laser_cannon.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon.png
old mode 100755
new mode 100644
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/laser_cannon.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_0.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_0.png
old mode 100755
new mode 100644
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_0.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_0.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_100.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_100.png
old mode 100755
new mode 100644
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_100.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_100.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_25.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_25.png
old mode 100755
new mode 100644
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_25.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_25.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_50.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_50.png
old mode 100755
new mode 100644
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_50.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_50.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_75.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_75.png
old mode 100755
new mode 100644
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/laser_cannon_75.png
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_75.png
diff --git a/Resources/Textures/Objects/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/laser_cannon.rsi/meta.json
rename to Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/meta.json
diff --git a/Resources/Textures/Objects/laser_retro.rsi/0-inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/0-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/0-inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/0-inhand-left.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/0-inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/0-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/0-inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/0-inhand-right.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/25-inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/25-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/25-inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/25-inhand-left.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/25-inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/25-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/25-inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/25-inhand-right.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/50-inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/50-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/50-inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/50-inhand-left.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/50-inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/50-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/50-inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/50-inhand-right.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/75-inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/75-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/75-inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/75-inhand-left.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/75-inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/75-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/75-inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/75-inhand-right.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/inhand-left.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/inhand-right.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/laser_retro.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/laser_retro.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/laser_retro_0.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_0.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/laser_retro_0.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_0.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/laser_retro_100.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_100.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/laser_retro_100.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_100.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/laser_retro_25.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_25.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/laser_retro_25.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_25.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/laser_retro_50.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_50.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/laser_retro_50.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_50.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/laser_retro_75.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_75.png
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/laser_retro_75.png
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_75.png
diff --git a/Resources/Textures/Objects/laser_retro.rsi/meta.json b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/laser_retro.rsi/meta.json
rename to Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/meta.json
diff --git a/Resources/Textures/Objects/bucket.png b/Resources/Textures/Objects/Janitorial/bucket.png
similarity index 100%
rename from Resources/Textures/Objects/bucket.png
rename to Resources/Textures/Objects/Janitorial/bucket.png
diff --git a/Resources/Textures/Objects/bucket_water.png b/Resources/Textures/Objects/Janitorial/bucket_water.png
similarity index 100%
rename from Resources/Textures/Objects/bucket_water.png
rename to Resources/Textures/Objects/Janitorial/bucket_water.png
diff --git a/Resources/Textures/Objects/janitorsuit.png b/Resources/Textures/Objects/Janitorial/janitorsuit.png
similarity index 100%
rename from Resources/Textures/Objects/janitorsuit.png
rename to Resources/Textures/Objects/Janitorial/janitorsuit.png
diff --git a/Resources/Textures/Objects/mop.png b/Resources/Textures/Objects/Janitorial/mop.png
similarity index 100%
rename from Resources/Textures/Objects/mop.png
rename to Resources/Textures/Objects/Janitorial/mop.png
diff --git a/Resources/Textures/Objects/mopbucket.png b/Resources/Textures/Objects/Janitorial/mopbucket.png
similarity index 100%
rename from Resources/Textures/Objects/mopbucket.png
rename to Resources/Textures/Objects/Janitorial/mopbucket.png
diff --git a/Resources/Textures/Objects/mopbucket_water.png b/Resources/Textures/Objects/Janitorial/mopbucket_water.png
similarity index 100%
rename from Resources/Textures/Objects/mopbucket_water.png
rename to Resources/Textures/Objects/Janitorial/mopbucket_water.png
diff --git a/Resources/Textures/Objects/light_bulb.rsi/broken.png b/Resources/Textures/Objects/Lighting/light_bulb.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Objects/light_bulb.rsi/broken.png
rename to Resources/Textures/Objects/Lighting/light_bulb.rsi/broken.png
diff --git a/Resources/Textures/Objects/light_bulb.rsi/burned.png b/Resources/Textures/Objects/Lighting/light_bulb.rsi/burned.png
similarity index 100%
rename from Resources/Textures/Objects/light_bulb.rsi/burned.png
rename to Resources/Textures/Objects/Lighting/light_bulb.rsi/burned.png
diff --git a/Resources/Textures/Objects/light_bulb.rsi/meta.json b/Resources/Textures/Objects/Lighting/light_bulb.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/light_bulb.rsi/meta.json
rename to Resources/Textures/Objects/Lighting/light_bulb.rsi/meta.json
diff --git a/Resources/Textures/Objects/light_bulb.rsi/normal.png b/Resources/Textures/Objects/Lighting/light_bulb.rsi/normal.png
similarity index 100%
rename from Resources/Textures/Objects/light_bulb.rsi/normal.png
rename to Resources/Textures/Objects/Lighting/light_bulb.rsi/normal.png
diff --git a/Resources/Textures/Objects/light_tube.rsi/broken.png b/Resources/Textures/Objects/Lighting/light_tube.rsi/broken.png
similarity index 100%
rename from Resources/Textures/Objects/light_tube.rsi/broken.png
rename to Resources/Textures/Objects/Lighting/light_tube.rsi/broken.png
diff --git a/Resources/Textures/Objects/light_tube.rsi/burned.png b/Resources/Textures/Objects/Lighting/light_tube.rsi/burned.png
similarity index 100%
rename from Resources/Textures/Objects/light_tube.rsi/burned.png
rename to Resources/Textures/Objects/Lighting/light_tube.rsi/burned.png
diff --git a/Resources/Textures/Objects/light_tube.rsi/meta.json b/Resources/Textures/Objects/Lighting/light_tube.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/light_tube.rsi/meta.json
rename to Resources/Textures/Objects/Lighting/light_tube.rsi/meta.json
diff --git a/Resources/Textures/Objects/light_tube.rsi/normal.png b/Resources/Textures/Objects/Lighting/light_tube.rsi/normal.png
similarity index 100%
rename from Resources/Textures/Objects/light_tube.rsi/normal.png
rename to Resources/Textures/Objects/Lighting/light_tube.rsi/normal.png
diff --git a/Resources/Textures/Objects/lighting.rsi/construct.png b/Resources/Textures/Objects/Lighting/lighting.rsi/construct.png
similarity index 100%
rename from Resources/Textures/Objects/lighting.rsi/construct.png
rename to Resources/Textures/Objects/Lighting/lighting.rsi/construct.png
diff --git a/Resources/Textures/Objects/lighting.rsi/empty.png b/Resources/Textures/Objects/Lighting/lighting.rsi/empty.png
similarity index 100%
rename from Resources/Textures/Objects/lighting.rsi/empty.png
rename to Resources/Textures/Objects/Lighting/lighting.rsi/empty.png
diff --git a/Resources/Textures/Objects/lighting.rsi/meta.json b/Resources/Textures/Objects/Lighting/lighting.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/lighting.rsi/meta.json
rename to Resources/Textures/Objects/Lighting/lighting.rsi/meta.json
diff --git a/Resources/Textures/Objects/lighting.rsi/off.png b/Resources/Textures/Objects/Lighting/lighting.rsi/off.png
similarity index 100%
rename from Resources/Textures/Objects/lighting.rsi/off.png
rename to Resources/Textures/Objects/Lighting/lighting.rsi/off.png
diff --git a/Resources/Textures/Objects/lighting.rsi/on.png b/Resources/Textures/Objects/Lighting/lighting.rsi/on.png
similarity index 100%
rename from Resources/Textures/Objects/lighting.rsi/on.png
rename to Resources/Textures/Objects/Lighting/lighting.rsi/on.png
diff --git a/Resources/Textures/Objects/Materials/alienhide.png b/Resources/Textures/Objects/Materials/alienhide.png
new file mode 100644
index 0000000000..153bbb66c7
Binary files /dev/null and b/Resources/Textures/Objects/Materials/alienhide.png differ
diff --git a/Resources/Textures/Objects/Materials/banananium.png b/Resources/Textures/Objects/Materials/banananium.png
new file mode 100644
index 0000000000..8429b587ea
Binary files /dev/null and b/Resources/Textures/Objects/Materials/banananium.png differ
diff --git a/Resources/Textures/Objects/Materials/cathide.png b/Resources/Textures/Objects/Materials/cathide.png
new file mode 100644
index 0000000000..0680b75b3c
Binary files /dev/null and b/Resources/Textures/Objects/Materials/cathide.png differ
diff --git a/Resources/Textures/Objects/Materials/copperbar_single.png b/Resources/Textures/Objects/Materials/copperbar_single.png
new file mode 100644
index 0000000000..cc81f37f49
Binary files /dev/null and b/Resources/Textures/Objects/Materials/copperbar_single.png differ
diff --git a/Resources/Textures/Objects/Materials/corgihide.png b/Resources/Textures/Objects/Materials/corgihide.png
new file mode 100644
index 0000000000..8d0f2344a3
Binary files /dev/null and b/Resources/Textures/Objects/Materials/corgihide.png differ
diff --git a/Resources/Textures/Objects/Materials/diamond.png b/Resources/Textures/Objects/Materials/diamond.png
new file mode 100644
index 0000000000..5eb8aabf87
Binary files /dev/null and b/Resources/Textures/Objects/Materials/diamond.png differ
diff --git a/Resources/Textures/Objects/Materials/goldbar_single.png b/Resources/Textures/Objects/Materials/goldbar_single.png
new file mode 100644
index 0000000000..3c88530bca
Binary files /dev/null and b/Resources/Textures/Objects/Materials/goldbar_single.png differ
diff --git a/Resources/Textures/Objects/Materials/leadbar_single.png b/Resources/Textures/Objects/Materials/leadbar_single.png
new file mode 100644
index 0000000000..c0403f6aed
Binary files /dev/null and b/Resources/Textures/Objects/Materials/leadbar_single.png differ
diff --git a/Resources/Textures/Objects/Materials/liggerhide.png b/Resources/Textures/Objects/Materials/liggerhide.png
new file mode 100644
index 0000000000..061a89dbad
Binary files /dev/null and b/Resources/Textures/Objects/Materials/liggerhide.png differ
diff --git a/Resources/Textures/Objects/Materials/monkeyhide.png b/Resources/Textures/Objects/Materials/monkeyhide.png
new file mode 100644
index 0000000000..ec54d9624f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/monkeyhide.png differ
diff --git a/Resources/Textures/Objects/Materials/plasma.png b/Resources/Textures/Objects/Materials/plasma.png
new file mode 100644
index 0000000000..2827a828f5
Binary files /dev/null and b/Resources/Textures/Objects/Materials/plasma.png differ
diff --git a/Resources/Textures/Objects/Materials/rods.png b/Resources/Textures/Objects/Materials/rods.png
new file mode 100644
index 0000000000..853ecb2da5
Binary files /dev/null and b/Resources/Textures/Objects/Materials/rods.png differ
diff --git a/Resources/Textures/Objects/sheet_glass.png b/Resources/Textures/Objects/Materials/sheet_glass.png
similarity index 100%
rename from Resources/Textures/Objects/sheet_glass.png
rename to Resources/Textures/Objects/Materials/sheet_glass.png
diff --git a/Resources/Textures/Objects/sheet_metal.png b/Resources/Textures/Objects/Materials/sheet_metal.png
similarity index 100%
rename from Resources/Textures/Objects/sheet_metal.png
rename to Resources/Textures/Objects/Materials/sheet_metal.png
diff --git a/Resources/Textures/Objects/Materials/steelbar_single.png b/Resources/Textures/Objects/Materials/steelbar_single.png
new file mode 100644
index 0000000000..c857b6f924
Binary files /dev/null and b/Resources/Textures/Objects/Materials/steelbar_single.png differ
diff --git a/Resources/Textures/Objects/Materials/tinbar_single.png b/Resources/Textures/Objects/Materials/tinbar_single.png
new file mode 100644
index 0000000000..c38ac35e14
Binary files /dev/null and b/Resources/Textures/Objects/Materials/tinbar_single.png differ
diff --git a/Resources/Textures/Objects/Materials/uranium.png b/Resources/Textures/Objects/Materials/uranium.png
new file mode 100644
index 0000000000..ebd96a9b36
Binary files /dev/null and b/Resources/Textures/Objects/Materials/uranium.png differ
diff --git a/Resources/Textures/Objects/Materials/wool.png b/Resources/Textures/Objects/Materials/wool.png
new file mode 100644
index 0000000000..6f53643483
Binary files /dev/null and b/Resources/Textures/Objects/Materials/wool.png differ
diff --git a/Resources/Textures/Objects/brutepack.png b/Resources/Textures/Objects/Medical/brutepack.png
similarity index 100%
rename from Resources/Textures/Objects/brutepack.png
rename to Resources/Textures/Objects/Medical/brutepack.png
diff --git a/Resources/Textures/Objects/Medical/cast.png b/Resources/Textures/Objects/Medical/cast.png
new file mode 100644
index 0000000000..bf2e0aeaec
Binary files /dev/null and b/Resources/Textures/Objects/Medical/cast.png differ
diff --git a/Resources/Textures/Objects/Medical/gauze.png b/Resources/Textures/Objects/Medical/gauze.png
new file mode 100644
index 0000000000..88d53ac473
Binary files /dev/null and b/Resources/Textures/Objects/Medical/gauze.png differ
diff --git a/Resources/Textures/Objects/medkit_r.png b/Resources/Textures/Objects/Medical/medkit_r.png
similarity index 100%
rename from Resources/Textures/Objects/medkit_r.png
rename to Resources/Textures/Objects/Medical/medkit_r.png
diff --git a/Resources/Textures/Objects/Medical/morphine.png b/Resources/Textures/Objects/Medical/morphine.png
new file mode 100644
index 0000000000..6e2c9f781f
Binary files /dev/null and b/Resources/Textures/Objects/Medical/morphine.png differ
diff --git a/Resources/Textures/Objects/ointment.png b/Resources/Textures/Objects/Medical/ointment.png
similarity index 100%
rename from Resources/Textures/Objects/ointment.png
rename to Resources/Textures/Objects/Medical/ointment.png
diff --git a/Resources/Textures/Objects/items/cleaver.rsi/butch.png b/Resources/Textures/Objects/Melee/cleaver.rsi/butch.png
similarity index 100%
rename from Resources/Textures/Objects/items/cleaver.rsi/butch.png
rename to Resources/Textures/Objects/Melee/cleaver.rsi/butch.png
diff --git a/Resources/Textures/Objects/items/cleaver.rsi/inhand-left.png b/Resources/Textures/Objects/Melee/cleaver.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/items/cleaver.rsi/inhand-left.png
rename to Resources/Textures/Objects/Melee/cleaver.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/items/cleaver.rsi/inhand-right.png b/Resources/Textures/Objects/Melee/cleaver.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/items/cleaver.rsi/inhand-right.png
rename to Resources/Textures/Objects/Melee/cleaver.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/items/cleaver.rsi/meta.json b/Resources/Textures/Objects/Melee/cleaver.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/items/cleaver.rsi/meta.json
rename to Resources/Textures/Objects/Melee/cleaver.rsi/meta.json
diff --git a/Resources/Textures/Objects/items/pickaxe.rsi/inhand-left.png b/Resources/Textures/Objects/Melee/pickaxe.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/items/pickaxe.rsi/inhand-left.png
rename to Resources/Textures/Objects/Melee/pickaxe.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/items/pickaxe.rsi/inhand-right.png b/Resources/Textures/Objects/Melee/pickaxe.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/items/pickaxe.rsi/inhand-right.png
rename to Resources/Textures/Objects/Melee/pickaxe.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/items/pickaxe.rsi/meta.json b/Resources/Textures/Objects/Melee/pickaxe.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/items/pickaxe.rsi/meta.json
rename to Resources/Textures/Objects/Melee/pickaxe.rsi/meta.json
diff --git a/Resources/Textures/Objects/items/pickaxe.rsi/pickaxe.png b/Resources/Textures/Objects/Melee/pickaxe.rsi/pickaxe.png
similarity index 100%
rename from Resources/Textures/Objects/items/pickaxe.rsi/pickaxe.png
rename to Resources/Textures/Objects/Melee/pickaxe.rsi/pickaxe.png
diff --git a/Resources/Textures/Objects/items/spear.rsi/inhand-left.png b/Resources/Textures/Objects/Melee/spear.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/items/spear.rsi/inhand-left.png
rename to Resources/Textures/Objects/Melee/spear.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/items/spear.rsi/inhand-right.png b/Resources/Textures/Objects/Melee/spear.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/items/spear.rsi/inhand-right.png
rename to Resources/Textures/Objects/Melee/spear.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/items/spear.rsi/meta.json b/Resources/Textures/Objects/Melee/spear.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/items/spear.rsi/meta.json
rename to Resources/Textures/Objects/Melee/spear.rsi/meta.json
diff --git a/Resources/Textures/Objects/items/spear.rsi/spear.png b/Resources/Textures/Objects/Melee/spear.rsi/spear.png
similarity index 100%
rename from Resources/Textures/Objects/items/spear.rsi/spear.png
rename to Resources/Textures/Objects/Melee/spear.rsi/spear.png
diff --git a/Resources/Textures/Objects/Misc/bluelighterlit.png b/Resources/Textures/Objects/Misc/bluelighterlit.png
new file mode 100644
index 0000000000..858dc6dbb2
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bluelighterlit.png differ
diff --git a/Resources/Textures/Objects/Misc/bluelighterunlit.png b/Resources/Textures/Objects/Misc/bluelighterunlit.png
new file mode 100644
index 0000000000..65162046ee
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bluelighterunlit.png differ
diff --git a/Resources/Textures/Objects/Misc/cableties.png b/Resources/Textures/Objects/Misc/cableties.png
new file mode 100644
index 0000000000..ceb16f2ec8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/cableties.png differ
diff --git a/Resources/Textures/Objects/fire_extinguisher.png b/Resources/Textures/Objects/Misc/fire_extinguisher.png
similarity index 100%
rename from Resources/Textures/Objects/fire_extinguisher.png
rename to Resources/Textures/Objects/Misc/fire_extinguisher.png
diff --git a/Resources/Textures/Objects/hand_tele.png b/Resources/Textures/Objects/Misc/hand_tele.png
similarity index 100%
rename from Resources/Textures/Objects/hand_tele.png
rename to Resources/Textures/Objects/Misc/hand_tele.png
diff --git a/Resources/Textures/Objects/hand_tele.rsi/charging.png b/Resources/Textures/Objects/Misc/hand_tele.rsi/charging.png
similarity index 100%
rename from Resources/Textures/Objects/hand_tele.rsi/charging.png
rename to Resources/Textures/Objects/Misc/hand_tele.rsi/charging.png
diff --git a/Resources/Textures/Objects/hand_tele.rsi/meta.json b/Resources/Textures/Objects/Misc/hand_tele.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/hand_tele.rsi/meta.json
rename to Resources/Textures/Objects/Misc/hand_tele.rsi/meta.json
diff --git a/Resources/Textures/Objects/hand_tele.rsi/ready.png b/Resources/Textures/Objects/Misc/hand_tele.rsi/ready.png
similarity index 100%
rename from Resources/Textures/Objects/hand_tele.rsi/ready.png
rename to Resources/Textures/Objects/Misc/hand_tele.rsi/ready.png
diff --git a/Resources/Textures/Objects/Misc/handcuffs.png b/Resources/Textures/Objects/Misc/handcuffs.png
new file mode 100644
index 0000000000..7c846f07a0
Binary files /dev/null and b/Resources/Textures/Objects/Misc/handcuffs.png differ
diff --git a/Resources/Textures/Objects/shoes.png b/Resources/Textures/Objects/Misc/shoes.png
similarity index 100%
rename from Resources/Textures/Objects/shoes.png
rename to Resources/Textures/Objects/Misc/shoes.png
diff --git a/Resources/Textures/Objects/Misc/soap.png b/Resources/Textures/Objects/Misc/soap.png
new file mode 100644
index 0000000000..d29dc4aad0
Binary files /dev/null and b/Resources/Textures/Objects/Misc/soap.png differ
diff --git a/Resources/Textures/Objects/rack_parts.rsi/icon.png b/Resources/Textures/Objects/Parts/rack_parts.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/rack_parts.rsi/icon.png
rename to Resources/Textures/Objects/Parts/rack_parts.rsi/icon.png
diff --git a/Resources/Textures/Objects/rack_parts.rsi/inhand-left.png b/Resources/Textures/Objects/Parts/rack_parts.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/rack_parts.rsi/inhand-left.png
rename to Resources/Textures/Objects/Parts/rack_parts.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/rack_parts.rsi/inhand-right.png b/Resources/Textures/Objects/Parts/rack_parts.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/rack_parts.rsi/inhand-right.png
rename to Resources/Textures/Objects/Parts/rack_parts.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/rack_parts.rsi/meta.json b/Resources/Textures/Objects/Parts/rack_parts.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/rack_parts.rsi/meta.json
rename to Resources/Textures/Objects/Parts/rack_parts.rsi/meta.json
diff --git a/Resources/Textures/Objects/table_parts.rsi/icon.png b/Resources/Textures/Objects/Parts/table_parts.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/table_parts.rsi/icon.png
rename to Resources/Textures/Objects/Parts/table_parts.rsi/icon.png
diff --git a/Resources/Textures/Objects/table_parts.rsi/inhand-left.png b/Resources/Textures/Objects/Parts/table_parts.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/table_parts.rsi/inhand-left.png
rename to Resources/Textures/Objects/Parts/table_parts.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/table_parts.rsi/inhand-right.png b/Resources/Textures/Objects/Parts/table_parts.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/table_parts.rsi/inhand-right.png
rename to Resources/Textures/Objects/Parts/table_parts.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/table_parts.rsi/meta.json b/Resources/Textures/Objects/Parts/table_parts.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/table_parts.rsi/meta.json
rename to Resources/Textures/Objects/Parts/table_parts.rsi/meta.json
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/meta.json
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/meta.json
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_0.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_0.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_0.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_100.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_100.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_100.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_25.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_25.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_25.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_50.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_50.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_50.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_75.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hi.rsi/s_hi_75.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_75.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/meta.json
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/meta.json
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_0.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_0.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_0.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_100.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_100.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_100.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_25.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_25.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_25.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_50.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_50.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_50.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_75.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_hy.rsi/s_hy_75.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_75.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/meta.json
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/meta.json
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_0.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_0.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_0.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_100.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_100.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_100.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_25.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_25.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_25.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_50.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_50.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_50.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_75.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_st.rsi/s_st_75.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_75.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/meta.json
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/meta.json
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_0.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_0.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_0.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_100.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_100.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_100.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_25.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_25.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_25.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_50.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_50.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_50.png
diff --git a/Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_75.png
similarity index 100%
rename from Resources/Textures/Objects/PowerCells/power_cell_small_sup.rsi/s_sup_75.png
rename to Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_75.png
diff --git a/Resources/Textures/Objects/eightdirwire.png b/Resources/Textures/Objects/Power/eightdirwire.png
similarity index 100%
rename from Resources/Textures/Objects/eightdirwire.png
rename to Resources/Textures/Objects/Power/eightdirwire.png
diff --git a/Resources/Textures/Objects/generator.png b/Resources/Textures/Objects/Power/generator.png
similarity index 100%
rename from Resources/Textures/Objects/generator.png
rename to Resources/Textures/Objects/Power/generator.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_0.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_0.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_0.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_0.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_1.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_1.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_1.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_1.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_10.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_10.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_10.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_10.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_11.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_11.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_11.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_11.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_12.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_12.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_12.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_12.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_13.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_13.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_13.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_13.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_14.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_14.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_14.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_14.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_15.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_15.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_15.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_15.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_2.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_2.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_2.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_2.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_3.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_3.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_3.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_3.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_4.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_4.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_4.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_4.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_5.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_5.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_5.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_5.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_6.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_6.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_6.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_6.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_7.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_7.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_7.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_7.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_8.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_8.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_8.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_8.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/cable_9.png b/Resources/Textures/Objects/Power/power_cable.rsi/cable_9.png
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/cable_9.png
rename to Resources/Textures/Objects/Power/power_cable.rsi/cable_9.png
diff --git a/Resources/Textures/Objects/power_cable.rsi/meta.json b/Resources/Textures/Objects/Power/power_cable.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/power_cable.rsi/meta.json
rename to Resources/Textures/Objects/Power/power_cable.rsi/meta.json
diff --git a/Resources/Textures/Objects/provider.png b/Resources/Textures/Objects/Power/provider.png
similarity index 100%
rename from Resources/Textures/Objects/provider.png
rename to Resources/Textures/Objects/Power/provider.png
diff --git a/Resources/Textures/Objects/storage.png b/Resources/Textures/Objects/Power/storage.png
similarity index 100%
rename from Resources/Textures/Objects/storage.png
rename to Resources/Textures/Objects/Power/storage.png
diff --git a/Resources/Textures/Objects/wiredmachine.png b/Resources/Textures/Objects/Power/wiredmachine.png
similarity index 100%
rename from Resources/Textures/Objects/wiredmachine.png
rename to Resources/Textures/Objects/Power/wiredmachine.png
diff --git a/Resources/Textures/Objects/heavylaser.png b/Resources/Textures/Objects/Projectiles/heavylaser.png
similarity index 100%
rename from Resources/Textures/Objects/heavylaser.png
rename to Resources/Textures/Objects/Projectiles/heavylaser.png
diff --git a/Resources/Textures/Objects/laser.png b/Resources/Textures/Objects/Projectiles/laser.png
similarity index 100%
rename from Resources/Textures/Objects/laser.png
rename to Resources/Textures/Objects/Projectiles/laser.png
diff --git a/Resources/Textures/Objects/Toolbox_b.png b/Resources/Textures/Objects/Tools/Toolbox_b.png
similarity index 100%
rename from Resources/Textures/Objects/Toolbox_b.png
rename to Resources/Textures/Objects/Tools/Toolbox_b.png
diff --git a/Resources/Textures/Objects/Toolbox_y.png b/Resources/Textures/Objects/Tools/Toolbox_y.png
similarity index 100%
rename from Resources/Textures/Objects/Toolbox_y.png
rename to Resources/Textures/Objects/Tools/Toolbox_y.png
diff --git a/Resources/Textures/Objects/welder.png b/Resources/Textures/Objects/Tools/autolathe_welder.png
similarity index 100%
rename from Resources/Textures/Objects/welder.png
rename to Resources/Textures/Objects/Tools/autolathe_welder.png
diff --git a/Resources/Textures/Objects/Tools/bucket.png b/Resources/Textures/Objects/Tools/bucket.png
new file mode 100644
index 0000000000..e4510dbe16
Binary files /dev/null and b/Resources/Textures/Objects/Tools/bucket.png differ
diff --git a/Resources/Textures/Objects/Tools/bucket_water.png b/Resources/Textures/Objects/Tools/bucket_water.png
new file mode 100644
index 0000000000..5f97bfaa5e
Binary files /dev/null and b/Resources/Textures/Objects/Tools/bucket_water.png differ
diff --git a/Resources/Textures/Objects/cable_coil.png b/Resources/Textures/Objects/Tools/cable_coil.png
similarity index 100%
rename from Resources/Textures/Objects/cable_coil.png
rename to Resources/Textures/Objects/Tools/cable_coil.png
diff --git a/Resources/Textures/Objects/crowbar.png b/Resources/Textures/Objects/Tools/crowbar.png
similarity index 100%
rename from Resources/Textures/Objects/crowbar.png
rename to Resources/Textures/Objects/Tools/crowbar.png
diff --git a/Resources/Textures/Objects/Flashlight.png b/Resources/Textures/Objects/Tools/flashlight.rsi/Flashlight.png
similarity index 100%
rename from Resources/Textures/Objects/Flashlight.png
rename to Resources/Textures/Objects/Tools/flashlight.rsi/Flashlight.png
diff --git a/Resources/Textures/Objects/lantern.rsi/HandheldLightOnOverlay.png b/Resources/Textures/Objects/Tools/flashlight.rsi/HandheldLightOnOverlay.png
similarity index 100%
rename from Resources/Textures/Objects/lantern.rsi/HandheldLightOnOverlay.png
rename to Resources/Textures/Objects/Tools/flashlight.rsi/HandheldLightOnOverlay.png
diff --git a/Resources/Textures/Objects/lantern.rsi/lantern_off.png b/Resources/Textures/Objects/Tools/flashlight.rsi/lantern_off.png
similarity index 100%
rename from Resources/Textures/Objects/lantern.rsi/lantern_off.png
rename to Resources/Textures/Objects/Tools/flashlight.rsi/lantern_off.png
diff --git a/Resources/Textures/Objects/lantern.rsi/meta.json b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/lantern.rsi/meta.json
rename to Resources/Textures/Objects/Tools/flashlight.rsi/meta.json
diff --git a/Resources/Textures/Objects/multitool.png b/Resources/Textures/Objects/Tools/multitool.png
similarity index 100%
rename from Resources/Textures/Objects/multitool.png
rename to Resources/Textures/Objects/Tools/multitool.png
diff --git a/Resources/Textures/Objects/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.png
similarity index 100%
rename from Resources/Textures/Objects/screwdriver.png
rename to Resources/Textures/Objects/Tools/screwdriver.png
diff --git a/Resources/Textures/Objects/Tools/stationplans.png b/Resources/Textures/Objects/Tools/stationplans.png
new file mode 100644
index 0000000000..ca72014b5d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/stationplans.png differ
diff --git a/Resources/Textures/Objects/toolbox_r.png b/Resources/Textures/Objects/Tools/toolbox_r.png
similarity index 100%
rename from Resources/Textures/Objects/toolbox_r.png
rename to Resources/Textures/Objects/Tools/toolbox_r.png
diff --git a/Resources/Textures/Objects/tools.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Objects/tools.rsi/meta.json
rename to Resources/Textures/Objects/Tools/welder.rsi/meta.json
diff --git a/Resources/Textures/Objects/tools.rsi/welder.png b/Resources/Textures/Objects/Tools/welder.rsi/welder.png
similarity index 100%
rename from Resources/Textures/Objects/tools.rsi/welder.png
rename to Resources/Textures/Objects/Tools/welder.rsi/welder.png
diff --git a/Resources/Textures/Objects/tools.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png
similarity index 100%
rename from Resources/Textures/Objects/tools.rsi/welder_flame.png
rename to Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png
diff --git a/Resources/Textures/Objects/wirecutter.png b/Resources/Textures/Objects/Tools/wirecutter.png
similarity index 100%
rename from Resources/Textures/Objects/wirecutter.png
rename to Resources/Textures/Objects/Tools/wirecutter.png
diff --git a/Resources/Textures/Objects/wrench.png b/Resources/Textures/Objects/Tools/wrench.png
similarity index 100%
rename from Resources/Textures/Objects/wrench.png
rename to Resources/Textures/Objects/Tools/wrench.png