diff --git a/Resources/Prototypes/Entities/Items.yml b/Resources/Prototypes/Entities/Items.yml
deleted file mode 100644
index 137b2ad6d1..0000000000
--- a/Resources/Prototypes/Entities/Items.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-- type: entity
-  name: "Item"
-  id: BaseItem
-  components:
-  - type: Item
-    Size: 5
-  - type: Clickable
-  - type: BoundingBox
-    aabb: "-0.25,-0.25,0.25,0.25"
-  - type: Collidable
-    mask: 5
-    layer: 8
-    IsScrapingFloor: true
-  - type: Physics
-    mass: 5
-  - type: Sprite
-    drawdepth: Items
-
-- type: entity
-  name: "Emergency Toolbox With Handle"
-  parent: BaseItem
-  id: RedToolboxItem
-  description: A shiny red and robust container
-  components:
-  - type: Sprite
-    texture: Objects/toolbox_r.png
-  - type: Icon
-    texture: Objects/toolbox_r.png
-  - type: Storage
-    Capacity: 60
-  - type: Item
-    Size: 9999
-
-- type: entity
-  name: "Mechanical Toolbox With Handle"
-  parent: BaseItem
-  id: BlueToolboxItem
-  description: A blue box, not the kind you're thinking of
-  components:
-  - type: Sprite
-    texture: Objects/Toolbox_b.png
-  - type: Icon
-    texture: Objects/Toolbox_b.png
-  - type: Storage
-    Capacity: 60
-  - type: Item
-    Size: 9999
-
-- type: entity
-  name: Electrical Toolbox
-  parent: BaseItem
-  id: YellowToolboxItem
-  description: A toolbox typically stocked with electrical gear
-  components:
-  - type: Sprite
-    texture: Objects/Toolbox_y.png
-  - type: Icon
-    texture: Objects/Toolbox_y.png
-  - type: Storage
-    Capacity: 60
-  - type: Item
-    Size: 9999
-
-- type: entity
-  id: YellowToolboxItemFilled
-  name: Electrical Toolbox (Filled)
-  parent: YellowToolboxItem
-  components:
-  - type: ToolboxElectricalFill
-
-- type: entity
-  name: "Extra-Grip™ Mop"
-  parent: BaseItem
-  id: MopItem
-  description: A mop that cant be stopped, viscera cleanup detail awaits
-  components:
-  - type: Sprite
-    texture: Objects/mop.png
-  - type: Icon
-    texture: Objects/mop.png
-  - type: Item
-    Size: 10
-
-- type: entity
-  name: "Fire Extinguisher"
-  parent: BaseItem
-  id: fire_extinguisher
-  description: Extinguishes fires.
-  components:
-  - type: Sprite
-    texture: Objects/fire_extinguisher.png
-  - type: Icon
-    texture: Objects/fire_extinguisher.png
-  - type: Item
-    Size: 10
-    
-#handheld lights
-- type: entity
-  name: "Flashlight"
-  parent: BaseItem
-  id: FlashlightLantern
-  description: They light the way to freedom
-  components:
-  - type: HandheldLight
-  - type: Sprite
-    sprite: Objects/lantern.rsi
-    layers:
-    - state: lantern_off
-    - state: HandheldLightOnOverlay
-      shader: unshaded
-      visible: false
-  - type: Icon
-    sprite: Objects/lantern.rsi
-    state: lantern_off
-  - type: PointLight
-    state: Off
-
-- type: entity
-  name: Bike Horn
-  parent: BaseItem
-  id: BikeHorn
-  description: A horn off of a bicycle.
-  components: 
-  - type: Sprite
-    sprite: Objects/bikehorn.rsi
-    state: icon
-
-  - type: Icon
-    sprite: Objects/bikehorn.rsi
-    state: icon
-
-  - type: Item
-    Size: 5
-    sprite: Objects/bikehorn.rsi
-
-  - type: Sound
-  - type: EmitSoundOnUse
-    sound: /Audio/items/bikehorn.ogg
-
-- type: entity
-  name: Table Parts
-  parent: BaseItem
-  id: TableParts
-  description: Parts of a table.
-  components: 
-  - type: Sprite
-    sprite: Objects/table_parts.rsi
-    state: icon
-
-  - type: Icon
-    sprite: Objects/table_parts.rsi
-    state: icon
-
-  - type: Item
-    Size: 25
-    sprite: Objects/table_parts.rsi
diff --git a/Resources/Prototypes/Entities/PoweredLighting.yml b/Resources/Prototypes/Entities/PoweredLighting.yml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Resources/Prototypes/Entities/Projectiles.yml b/Resources/Prototypes/Entities/Projectiles.yml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Resources/Prototypes/Entities/Door.yml b/Resources/Prototypes/Entities/buildings/airlock_base.yml
similarity index 61%
rename from Resources/Prototypes/Entities/Door.yml
rename to Resources/Prototypes/Entities/buildings/airlock_base.yml
index 69914433bc..7ee129c9d5 100644
--- a/Resources/Prototypes/Entities/Door.yml
+++ b/Resources/Prototypes/Entities/buildings/airlock_base.yml
@@ -36,31 +36,3 @@
 
   placement:
     mode: SnapgridBorder
-
-- type: entity
-  parent: airlock
-  id: airlock_external
-  name: External Airlock
-  components:
-  - type: Sprite
-    sprite: Buildings/airlock_external.rsi
-
-  - type: Icon
-    sprite: Buildings/airlock_external.rsi
-
-  - type: Appearance
-    visuals:
-    - type: AirlockVisualizer2D
-      open_sound: /Audio/machines/airlock_ext_open.ogg
-      close_sound: /Audio/machines/airlock_ext_close.ogg
-
-- type: entity
-  parent: airlock
-  id: airlock_engineering
-  name: Engineering Airlock
-  components:
-  - type: Sprite
-    sprite: Buildings/airlock_engineering.rsi
-
-  - type: Icon
-    sprite: Buildings/airlock_engineering.rsi
diff --git a/Resources/Prototypes/Entities/buildings/airlock_types.yml b/Resources/Prototypes/Entities/buildings/airlock_types.yml
new file mode 100644
index 0000000000..c2e7548bfa
--- /dev/null
+++ b/Resources/Prototypes/Entities/buildings/airlock_types.yml
@@ -0,0 +1,27 @@
+- type: entity
+  parent: airlock
+  id: airlock_external
+  name: External Airlock
+  components:
+  - type: Sprite
+    sprite: Buildings/airlock_external.rsi
+
+  - type: Icon
+    sprite: Buildings/airlock_external.rsi
+
+  - type: Appearance
+    visuals:
+    - type: AirlockVisualizer2D
+      open_sound: /Audio/machines/airlock_ext_open.ogg
+      close_sound: /Audio/machines/airlock_ext_close.ogg
+
+- type: entity
+  parent: airlock
+  id: airlock_engineering
+  name: Engineering Airlock
+  components:
+  - type: Sprite
+    sprite: Buildings/airlock_engineering.rsi
+
+  - type: Icon
+    sprite: Buildings/airlock_engineering.rsi
diff --git a/Resources/Prototypes/Entities/catwalk.yml b/Resources/Prototypes/Entities/buildings/catwalk.yml
similarity index 100%
rename from Resources/Prototypes/Entities/catwalk.yml
rename to Resources/Prototypes/Entities/buildings/catwalk.yml
diff --git a/Resources/Prototypes/Entities/Container.yml b/Resources/Prototypes/Entities/buildings/fuel_tank.yml
similarity index 56%
rename from Resources/Prototypes/Entities/Container.yml
rename to Resources/Prototypes/Entities/buildings/fuel_tank.yml
index 483b6f568a..d4a6605fef 100644
--- a/Resources/Prototypes/Entities/Container.yml
+++ b/Resources/Prototypes/Entities/buildings/fuel_tank.yml
@@ -1,32 +1,3 @@
-- type: entity
-  id: crate_generic
-  name: Crate
-  description: A large container for items.
-  components:
-  - type: Sprite
-    sprite: Buildings/crate.rsi
-    layers:
-    - state: crate
-    - state: crate_door
-
-  - type: Icon
-    sprite: Buildings/crate.rsi
-    state: crate
-
-  - type: Clickable
-  - type: BoundingBox
-  - type: Collidable
-  - type: Storage
-    Capacity: 60
-    
-  - type: Damageable
-  - type: Destructible
-    thresholdvalue: 100
-
-  placement:
-    snap:
-    - Wall
-
 - type: entity
   id: weldtank
   name: Fueltank
@@ -58,4 +29,4 @@
 
   placement:
     snap:
-    - Wall
\ No newline at end of file
+    - Wall
diff --git a/Resources/Prototypes/Entities/girder.yml b/Resources/Prototypes/Entities/buildings/girder.yml
similarity index 100%
rename from Resources/Prototypes/Entities/girder.yml
rename to Resources/Prototypes/Entities/buildings/girder.yml
diff --git a/Resources/Prototypes/Entities/Lathe.yml b/Resources/Prototypes/Entities/buildings/lathe.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Lathe.yml
rename to Resources/Prototypes/Entities/buildings/lathe.yml
diff --git a/Resources/Prototypes/Entities/Lights.yml b/Resources/Prototypes/Entities/buildings/lighting.yml
similarity index 54%
rename from Resources/Prototypes/Entities/Lights.yml
rename to Resources/Prototypes/Entities/buildings/lighting.yml
index ce44c3087d..ac44f005fa 100644
--- a/Resources/Prototypes/Entities/Lights.yml
+++ b/Resources/Prototypes/Entities/buildings/lighting.yml
@@ -46,7 +46,7 @@
 
   - type: PoweredLight
     bulb: Tube
-    
+
 - type: entity
   name: Small Light
   id: poweredsmalllight
@@ -72,58 +72,3 @@
   - type: PoweredLight
     bulb: Bulb
 
-- type: entity
-  parent: BaseItem
-  name: BaseLightbulb
-  id: BaseLightbulb
-  components:
-  - type: LightBulb
-  
-- type: entity
-  parent: BaseLightbulb
-  name: Light Tube
-  id: LightTube
-  components:
-  - type: LightBulb
-    bulb: Tube
-    
-  - type: Sprite
-    sprite: Objects/light_tube.rsi
-    state: normal
-    
-  - type: Icon
-    sprite: Objects/light_tube.rsi
-    state: normal
-    
-- type: entity
-  parent: BaseLightbulb
-  name: LED Light Tube
-  id: LedLightTube
-  components:
-  - type: LightBulb
-    bulb: Tube
-    color: "#EEEEFF"
-    BurningTemperature: 350
-    PowerUse: 9
-  - type: Sprite
-    sprite: Objects/light_tube.rsi
-    state: normal
-  - type: Icon
-    sprite: Objects/light_tube.rsi
-    state: normal
-    
-- type: entity
-  parent: BaseLightbulb
-  name: Light Bulb
-  id: LightBulb
-  components:
-  - type: LightBulb
-    bulb: Bulb
-    
-  - type: Sprite
-    sprite: Objects/light_bulb.rsi
-    state: normal
-    
-  - type: Icon
-    sprite: Objects/light_bulb.rsi
-    state: normal
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/walls/structures/low_wall.yml b/Resources/Prototypes/Entities/buildings/low_wall.yml
similarity index 100%
rename from Resources/Prototypes/Entities/walls/structures/low_wall.yml
rename to Resources/Prototypes/Entities/buildings/low_wall.yml
diff --git a/Resources/Prototypes/Entities/Power.yml b/Resources/Prototypes/Entities/buildings/power.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Power.yml
rename to Resources/Prototypes/Entities/buildings/power.yml
diff --git a/Resources/Prototypes/Entities/buildings/storage/closet_base.yml b/Resources/Prototypes/Entities/buildings/storage/closet_base.yml
new file mode 100644
index 0000000000..685e1628b8
--- /dev/null
+++ b/Resources/Prototypes/Entities/buildings/storage/closet_base.yml
@@ -0,0 +1,39 @@
+- type: entity
+  id: locker_generic
+  name: Locker
+  description: A standard-issue Nanotrasen storage unit.
+  components:
+  - type: Sprite
+    sprite: Buildings/closet.rsi
+    layers:
+    - state: generic
+    - state: generic_door
+      map: ["enum.StorageVisualLayers.Door"]
+
+  - type: Icon
+    sprite: Buildings/closet.rsi
+    state: generic_door
+
+  - type: Clickable
+  - type: BoundingBox
+    aabb: "-0.5,-0.25,0.5,0.25"
+  - type: Collidable
+    mask: 3
+    IsScrapingFloor: true
+  - type: Physics
+    mass: 25
+    Anchored: false
+  - type: EntityStorage
+  - type: PlaceableSurface
+  - type: Damageable
+  - type: Destructible
+    thresholdvalue: 100
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state_open: generic_open
+      state_closed: generic_door
+
+  placement:
+    snap:
+    - Wall
diff --git a/Resources/Prototypes/Entities/buildings/storage/closet_types.yml b/Resources/Prototypes/Entities/buildings/storage/closet_types.yml
new file mode 100644
index 0000000000..744ac26b17
--- /dev/null
+++ b/Resources/Prototypes/Entities/buildings/storage/closet_types.yml
@@ -0,0 +1,90 @@
+- type: entity
+  id: locker_tool
+  name: Tool Locker
+  parent: locker_generic
+  components:
+  - type: Sprite
+    sprite: Buildings/closet.rsi
+    layers:
+    - state: eng
+    - state: eng_tool_door
+      map: ["enum.StorageVisualLayers.Door"]
+
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state_open: eng_open
+      state_closed: eng_tool_door
+
+  - type: Icon
+    state: eng_tool_door
+
+- type: entity
+  id: locker_tool_filled
+  name: Tool Locker (Filled)
+  parent: locker_tool
+  components:
+  - type: ToolLockerFill
+
+- type: entity
+  id: locker_electrical_supplies
+  name: Electrical Supplies Locker
+  parent: locker_generic
+  components:
+  - type: Sprite
+    sprite: Buildings/closet.rsi
+    layers:
+    - state: eng
+    - state: eng_elec_door
+      map: ["enum.StorageVisualLayers.Door"]
+
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state_open: eng_open
+      state_closed: eng_elec_door
+
+  - type: Icon
+    state: eng_elec_door
+
+- type: entity
+  id: locker_welding_supplies
+  name: Welding Supplies Locker
+  parent: locker_generic
+  components:
+  - type: Sprite
+    sprite: Buildings/closet.rsi
+    layers:
+    - state: eng
+    - state: eng_weld_door
+      map: ["enum.StorageVisualLayers.Door"]
+
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state_open: eng_open
+      state_closed: eng_weld_door
+
+  - type: Icon
+    state: eng_weld_door
+
+- type: entity
+  id: locker_radiation_suit
+  name: Radiation Suit Locker
+  parent: locker_generic
+  components:
+  - type: Sprite
+    sprite: Buildings/closet.rsi
+    layers:
+    - state: eng
+    - state: eng_rad_door
+      map: ["enum.StorageVisualLayers.Door"]
+
+  - type: Appearance
+    visuals:
+    - type: StorageVisualizer2D
+      state_open: eng_open
+      state_closed: eng_rad_door
+
+  - type: Icon
+    state: eng_rad_door
diff --git a/Resources/Prototypes/Entities/buildings/storage/crate_base.yml b/Resources/Prototypes/Entities/buildings/storage/crate_base.yml
new file mode 100644
index 0000000000..de4c846a38
--- /dev/null
+++ b/Resources/Prototypes/Entities/buildings/storage/crate_base.yml
@@ -0,0 +1,28 @@
+- type: entity
+  id: crate_generic
+  name: Crate
+  description: A large container for items.
+  components:
+  - type: Sprite
+    sprite: Buildings/crate.rsi
+    layers:
+    - state: crate
+    - state: crate_door
+
+  - type: Icon
+    sprite: Buildings/crate.rsi
+    state: crate
+
+  - type: Clickable
+  - type: BoundingBox
+  - type: Collidable
+  - type: Storage
+    Capacity: 60
+
+  - type: Damageable
+  - type: Destructible
+    thresholdvalue: 100
+
+  placement:
+    snap:
+    - Wall
diff --git a/Resources/Prototypes/Entities/table.yml b/Resources/Prototypes/Entities/buildings/table.yml
similarity index 100%
rename from Resources/Prototypes/Entities/table.yml
rename to Resources/Prototypes/Entities/buildings/table.yml
diff --git a/Resources/Prototypes/Entities/Turret.yml b/Resources/Prototypes/Entities/buildings/turret.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Turret.yml
rename to Resources/Prototypes/Entities/buildings/turret.yml
diff --git a/Resources/Prototypes/Entities/walls.yml b/Resources/Prototypes/Entities/buildings/walls.yml
similarity index 100%
rename from Resources/Prototypes/Entities/walls.yml
rename to Resources/Prototypes/Entities/buildings/walls.yml
diff --git a/Resources/Prototypes/Entities/walls/structures/windows.yml b/Resources/Prototypes/Entities/buildings/windows.yml
similarity index 100%
rename from Resources/Prototypes/Entities/walls/structures/windows.yml
rename to Resources/Prototypes/Entities/buildings/windows.yml
diff --git a/Resources/Prototypes/Entities/closet.yml b/Resources/Prototypes/Entities/closet.yml
deleted file mode 100644
index dd68a6f66a..0000000000
--- a/Resources/Prototypes/Entities/closet.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-- type: entity
-  id: locker_generic
-  name: Locker
-  description: A standard-issue Nanotrasen storage unit.
-  components:
-  - type: Sprite
-    sprite: Buildings/closet.rsi
-    layers:
-    - state: generic
-    - state: generic_door
-      map: ["enum.StorageVisualLayers.Door"]
-
-  - type: Icon
-    sprite: Buildings/closet.rsi
-    state: generic_door
-
-  - type: Clickable
-  - type: BoundingBox
-    aabb: "-0.5,-0.25,0.5,0.25"
-  - type: Collidable
-    mask: 3
-    IsScrapingFloor: true
-  - type: Physics
-    mass: 25
-    Anchored: false
-  - type: EntityStorage
-  - type: PlaceableSurface
-  - type: Damageable
-  - type: Destructible
-    thresholdvalue: 100
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state_open: generic_open
-      state_closed: generic_door
-
-  placement:
-    snap:
-    - Wall
-
-- type: entity
-  id: locker_tool
-  name: Tool Locker
-  parent: locker_generic
-  components:
-  - type: Sprite
-    sprite: Buildings/closet.rsi
-    layers:
-    - state: eng
-    - state: eng_tool_door
-      map: ["enum.StorageVisualLayers.Door"]
-
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer2D
-      state_open: eng_open
-      state_closed: eng_tool_door
-
-  - type: Icon
-    state: eng_tool_door
-
-- type: entity
-  id: locker_tool_filled
-  name: Tool Locker (Filled)
-  parent: locker_tool
-  components:
-  - type: ToolLockerFill
-
-- type: entity
-  id: locker_electrical_supplies
-  name: Electrical Supplies Locker
-  parent: locker_generic
-  components:
-    - type: Sprite
-      sprite: Buildings/closet.rsi
-      layers:
-      - state: eng
-      - state: eng_elec_door
-        map: ["enum.StorageVisualLayers.Door"]
-
-    - type: Appearance
-      visuals:
-      - type: StorageVisualizer2D
-        state_open: eng_open
-        state_closed: eng_elec_door
-
-    - type: Icon
-      state: eng_elec_door
-
-- type: entity
-  id: locker_welding_supplies
-  name: Welding Supplies Locker
-  parent: locker_generic
-  components:
-    - type: Sprite
-      sprite: Buildings/closet.rsi
-      layers:
-      - state: eng
-      - state: eng_weld_door
-        map: ["enum.StorageVisualLayers.Door"]
-
-    - type: Appearance
-      visuals:
-      - type: StorageVisualizer2D
-        state_open: eng_open
-        state_closed: eng_weld_door
-
-    - type: Icon
-      state: eng_weld_door
-
-- type: entity
-  id: locker_radiation_suit
-  name: Radiation Suit Locker
-  parent: locker_generic
-  components:
-    - type: Sprite
-      sprite: Buildings/closet.rsi
-      layers:
-      - state: eng
-      - state: eng_rad_door
-        map: ["enum.StorageVisualLayers.Door"]
-
-    - type: Appearance
-      visuals:
-      - type: StorageVisualizer2D
-        state_open: eng_open
-        state_closed: eng_rad_door
-
-    - type: Icon
-      state: eng_rad_door
diff --git a/Resources/Prototypes/Entities/items/bike_horn.yml b/Resources/Prototypes/Entities/items/bike_horn.yml
new file mode 100644
index 0000000000..f5f8c1fa34
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/bike_horn.yml
@@ -0,0 +1,21 @@
+- type: entity
+  name: Bike Horn
+  parent: BaseItem
+  id: BikeHorn
+  description: A horn off of a bicycle.
+  components:
+  - type: Sprite
+    sprite: Objects/bikehorn.rsi
+    state: icon
+
+  - type: Icon
+    sprite: Objects/bikehorn.rsi
+    state: icon
+
+  - type: Item
+    Size: 5
+    sprite: Objects/bikehorn.rsi
+
+  - type: Sound
+  - type: EmitSoundOnUse
+    sound: /Audio/items/bikehorn.ogg
diff --git a/Resources/Prototypes/Entities/Clothing/IDs.yml b/Resources/Prototypes/Entities/items/clothing/IDs.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/IDs.yml
rename to Resources/Prototypes/Entities/items/clothing/IDs.yml
diff --git a/Resources/Prototypes/Entities/Clothing/backpacks.yml b/Resources/Prototypes/Entities/items/clothing/backpacks.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/backpacks.yml
rename to Resources/Prototypes/Entities/items/clothing/backpacks.yml
diff --git a/Resources/Prototypes/Entities/Clothing/belts.yml b/Resources/Prototypes/Entities/items/clothing/belts.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/belts.yml
rename to Resources/Prototypes/Entities/items/clothing/belts.yml
diff --git a/Resources/Prototypes/Entities/Clothing.yml b/Resources/Prototypes/Entities/items/clothing/clothing_base.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing.yml
rename to Resources/Prototypes/Entities/items/clothing/clothing_base.yml
diff --git a/Resources/Prototypes/Entities/Clothing/ears.yml b/Resources/Prototypes/Entities/items/clothing/ears.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/ears.yml
rename to Resources/Prototypes/Entities/items/clothing/ears.yml
diff --git a/Resources/Prototypes/Entities/Clothing/eyes.yml b/Resources/Prototypes/Entities/items/clothing/eyes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/eyes.yml
rename to Resources/Prototypes/Entities/items/clothing/eyes.yml
diff --git a/Resources/Prototypes/Entities/Clothing/gloves.yml b/Resources/Prototypes/Entities/items/clothing/gloves.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/gloves.yml
rename to Resources/Prototypes/Entities/items/clothing/gloves.yml
diff --git a/Resources/Prototypes/Entities/Clothing/helmets.yml b/Resources/Prototypes/Entities/items/clothing/helmets.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/helmets.yml
rename to Resources/Prototypes/Entities/items/clothing/helmets.yml
diff --git a/Resources/Prototypes/Entities/Clothing/masks.yml b/Resources/Prototypes/Entities/items/clothing/masks.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/masks.yml
rename to Resources/Prototypes/Entities/items/clothing/masks.yml
diff --git a/Resources/Prototypes/Entities/Clothing/shoes.yml b/Resources/Prototypes/Entities/items/clothing/shoes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/shoes.yml
rename to Resources/Prototypes/Entities/items/clothing/shoes.yml
diff --git a/Resources/Prototypes/Entities/Clothing/suits.yml b/Resources/Prototypes/Entities/items/clothing/suits.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/suits.yml
rename to Resources/Prototypes/Entities/items/clothing/suits.yml
diff --git a/Resources/Prototypes/Entities/Clothing/uniforms.yml b/Resources/Prototypes/Entities/items/clothing/uniforms.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/uniforms.yml
rename to Resources/Prototypes/Entities/items/clothing/uniforms.yml
diff --git a/Resources/Prototypes/Entities/Dice.yml b/Resources/Prototypes/Entities/items/dice.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Dice.yml
rename to Resources/Prototypes/Entities/items/dice.yml
diff --git a/Resources/Prototypes/Entities/Explosives.yml b/Resources/Prototypes/Entities/items/explosives.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Explosives.yml
rename to Resources/Prototypes/Entities/items/explosives.yml
diff --git a/Resources/Prototypes/Entities/items/fire_extinguisher.yml b/Resources/Prototypes/Entities/items/fire_extinguisher.yml
new file mode 100644
index 0000000000..4a8a847631
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/fire_extinguisher.yml
@@ -0,0 +1,12 @@
+- type: entity
+  name: Fire Extinguisher
+  parent: BaseItem
+  id: fire_extinguisher
+  description: Extinguishes fires.
+  components:
+  - type: Sprite
+    texture: Objects/fire_extinguisher.png
+  - type: Icon
+    texture: Objects/fire_extinguisher.png
+  - type: Item
+    Size: 10
diff --git a/Resources/Prototypes/Entities/items/flashlight.yml b/Resources/Prototypes/Entities/items/flashlight.yml
new file mode 100644
index 0000000000..7d3bbee634
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/flashlight.yml
@@ -0,0 +1,19 @@
+- type: entity
+  name: Flashlight
+  parent: BaseItem
+  id: FlashlightLantern
+  description: They light the way to freedom
+  components:
+  - type: HandheldLight
+  - type: Sprite
+    sprite: Objects/lantern.rsi
+    layers:
+    - state: lantern_off
+    - state: HandheldLightOnOverlay
+      shader: unshaded
+      visible: false
+  - type: Icon
+    sprite: Objects/lantern.rsi
+    state: lantern_off
+  - type: PointLight
+    state: Off
diff --git a/Resources/Prototypes/Entities/items/item_base.yml b/Resources/Prototypes/Entities/items/item_base.yml
new file mode 100644
index 0000000000..b5be445067
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/item_base.yml
@@ -0,0 +1,17 @@
+- type: entity
+  name: "Item"
+  id: BaseItem
+  components:
+  - type: Item
+    Size: 5
+  - type: Clickable
+  - type: BoundingBox
+    aabb: "-0.25,-0.25,0.25,0.25"
+  - type: Collidable
+    mask: 5
+    layer: 8
+    IsScrapingFloor: true
+  - type: Physics
+    mass: 5
+  - type: Sprite
+    drawdepth: Items
diff --git a/Resources/Prototypes/Entities/items/light_bulb.yml b/Resources/Prototypes/Entities/items/light_bulb.yml
new file mode 100644
index 0000000000..fb6dadc64a
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/light_bulb.yml
@@ -0,0 +1,56 @@
+- type: entity
+  parent: BaseLightbulb
+  name: Light Bulb
+  id: LightBulb
+  components:
+  - type: LightBulb
+    bulb: Bulb
+
+  - type: Sprite
+    sprite: Objects/light_bulb.rsi
+    state: normal
+
+  - type: Icon
+    sprite: Objects/light_bulb.rsi
+    state: normal
+
+- type: entity
+  parent: BaseItem
+  name: BaseLightbulb
+  id: BaseLightbulb
+  components:
+  - type: LightBulb
+
+- type: entity
+  parent: BaseLightbulb
+  name: Light Tube
+  id: LightTube
+  components:
+  - type: LightBulb
+    bulb: Tube
+
+  - type: Sprite
+    sprite: Objects/light_tube.rsi
+    state: normal
+
+  - type: Icon
+    sprite: Objects/light_tube.rsi
+    state: normal
+
+- type: entity
+  parent: BaseLightbulb
+  name: LED Light Tube
+  id: LedLightTube
+  components:
+  - type: LightBulb
+    bulb: Tube
+    color: "#EEEEFF"
+    BurningTemperature: 350
+    PowerUse: 9
+  - type: Sprite
+    sprite: Objects/light_tube.rsi
+    state: normal
+  - type: Icon
+    sprite: Objects/light_tube.rsi
+    state: normal
+
diff --git a/Resources/Prototypes/Entities/Materials.yml b/Resources/Prototypes/Entities/items/materials.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Materials.yml
rename to Resources/Prototypes/Entities/items/materials.yml
diff --git a/Resources/Prototypes/Entities/Medical.yml b/Resources/Prototypes/Entities/items/medical.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Medical.yml
rename to Resources/Prototypes/Entities/items/medical.yml
diff --git a/Resources/Prototypes/Entities/items/mop.yml b/Resources/Prototypes/Entities/items/mop.yml
new file mode 100644
index 0000000000..66e0856a06
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/mop.yml
@@ -0,0 +1,12 @@
+- type: entity
+  name: Extra-Grip Mop
+  parent: BaseItem
+  id: MopItem
+  description: A mop that cant be stopped, viscera cleanup detail awaits
+  components:
+  - type: Sprite
+    texture: Objects/mop.png
+  - type: Icon
+    texture: Objects/mop.png
+  - type: Item
+    Size: 10
diff --git a/Resources/Prototypes/Entities/powercells.yml b/Resources/Prototypes/Entities/items/powercells.yml
similarity index 100%
rename from Resources/Prototypes/Entities/powercells.yml
rename to Resources/Prototypes/Entities/items/powercells.yml
diff --git a/Resources/Prototypes/Entities/items/table_parts.yml b/Resources/Prototypes/Entities/items/table_parts.yml
new file mode 100644
index 0000000000..88a59b2705
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/table_parts.yml
@@ -0,0 +1,17 @@
+- type: entity
+  name: Table Parts
+  parent: BaseItem
+  id: TableParts
+  description: Parts of a table.
+  components:
+  - type: Sprite
+    sprite: Objects/table_parts.rsi
+    state: icon
+
+  - type: Icon
+    sprite: Objects/table_parts.rsi
+    state: icon
+
+  - type: Item
+    Size: 25
+    sprite: Objects/table_parts.rsi
diff --git a/Resources/Prototypes/Entities/Teleporters.yml b/Resources/Prototypes/Entities/items/teleporters.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Teleporters.yml
rename to Resources/Prototypes/Entities/items/teleporters.yml
diff --git a/Resources/Prototypes/Entities/items/toolbox.yml b/Resources/Prototypes/Entities/items/toolbox.yml
new file mode 100644
index 0000000000..8516602a9c
--- /dev/null
+++ b/Resources/Prototypes/Entities/items/toolbox.yml
@@ -0,0 +1,51 @@
+- type: entity
+  name: Emergency Toolbox
+  parent: BaseItem
+  id: RedToolboxItem
+  description: A shiny red and robust container
+  components:
+  - type: Sprite
+    texture: Objects/toolbox_r.png
+  - type: Icon
+    texture: Objects/toolbox_r.png
+  - type: Storage
+    Capacity: 60
+  - type: Item
+    Size: 9999
+
+- type: entity
+  name: Mechanical Toolbox
+  parent: BaseItem
+  id: BlueToolboxItem
+  description: A blue box, not the kind you're thinking of
+  components:
+  - type: Sprite
+    texture: Objects/Toolbox_b.png
+  - type: Icon
+    texture: Objects/Toolbox_b.png
+  - type: Storage
+    Capacity: 60
+  - type: Item
+    Size: 9999
+
+- type: entity
+  name: Electrical Toolbox
+  parent: BaseItem
+  id: YellowToolboxItem
+  description: A toolbox typically stocked with electrical gear
+  components:
+  - type: Sprite
+    texture: Objects/Toolbox_y.png
+  - type: Icon
+    texture: Objects/Toolbox_y.png
+  - type: Storage
+    Capacity: 60
+  - type: Item
+    Size: 9999
+
+- type: entity
+  id: YellowToolboxItemFilled
+  name: Electrical Toolbox (Filled)
+  parent: YellowToolboxItem
+  components:
+  - type: ToolboxElectricalFill
diff --git a/Resources/Prototypes/Entities/Tools.yml b/Resources/Prototypes/Entities/items/tools.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Tools.yml
rename to Resources/Prototypes/Entities/items/tools.yml
diff --git a/Resources/Prototypes/Entities/weapons/ammunition.yml b/Resources/Prototypes/Entities/items/weapons/ammunition.yml
similarity index 100%
rename from Resources/Prototypes/Entities/weapons/ammunition.yml
rename to Resources/Prototypes/Entities/items/weapons/ammunition.yml
diff --git a/Resources/Prototypes/Entities/weapons/guns.yml b/Resources/Prototypes/Entities/items/weapons/guns.yml
similarity index 100%
rename from Resources/Prototypes/Entities/weapons/guns.yml
rename to Resources/Prototypes/Entities/items/weapons/guns.yml
diff --git a/Resources/Prototypes/Entities/weapons/laserguns.yml b/Resources/Prototypes/Entities/items/weapons/laserguns.yml
similarity index 100%
rename from Resources/Prototypes/Entities/weapons/laserguns.yml
rename to Resources/Prototypes/Entities/items/weapons/laserguns.yml
diff --git a/Resources/Prototypes/Entities/weapons/projectiles.yml b/Resources/Prototypes/Entities/items/weapons/projectiles.yml
similarity index 100%
rename from Resources/Prototypes/Entities/weapons/projectiles.yml
rename to Resources/Prototypes/Entities/items/weapons/projectiles.yml
diff --git a/Resources/Prototypes/Entities/Weapons.yml b/Resources/Prototypes/Entities/items/weapons/spear.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Weapons.yml
rename to Resources/Prototypes/Entities/items/weapons/spear.yml
diff --git a/Resources/Prototypes/Entities/Construction.yml b/Resources/Prototypes/Entities/markers/construction_ghost.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Construction.yml
rename to Resources/Prototypes/Entities/markers/construction_ghost.yml
diff --git a/Resources/Prototypes/Entities/mobs/adminghost.yml b/Resources/Prototypes/Entities/mobs/adminghost.yml
new file mode 100644
index 0000000000..736f388b67
--- /dev/null
+++ b/Resources/Prototypes/Entities/mobs/adminghost.yml
@@ -0,0 +1,4 @@
+- type: entity
+  parent: MobObserver
+  save: false
+  id: AdminObserver
diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/mobs/human.yml
similarity index 78%
rename from Resources/Prototypes/Entities/Mobs.yml
rename to Resources/Prototypes/Entities/mobs/human.yml
index 5d5d58865f..fc390c9609 100644
--- a/Resources/Prototypes/Entities/Mobs.yml
+++ b/Resources/Prototypes/Entities/mobs/human.yml
@@ -69,26 +69,3 @@
   - type: Examiner
   - type: CharacterInfo
 
-- type: entity
-  id: MobObserver
-  name: Observer
-  save: false
-  description: Boo!
-  components:
-  - type: Physics
-    mass: 5
-  - type: Eye
-    zoom: 0.5, 0.5
-  - type: BoundingBox
-    aabb: "-0.5,-0.25,-0.05,0.25"
-  - type: Input
-    context: "ghost"
-  - type: Examiner
-    DoRangeCheck: false
-
-
-- type: entity
-  parent: MobObserver
-  save: false
-  id: AdminObserver
-
diff --git a/Resources/Prototypes/Entities/mobs/observer.yml b/Resources/Prototypes/Entities/mobs/observer.yml
new file mode 100644
index 0000000000..28cbf23009
--- /dev/null
+++ b/Resources/Prototypes/Entities/mobs/observer.yml
@@ -0,0 +1,16 @@
+- type: entity
+  id: MobObserver
+  name: Observer
+  save: false
+  description: Boo!
+  components:
+  - type: Physics
+    mass: 5
+  - type: Eye
+    zoom: 0.5, 0.5
+  - type: BoundingBox
+    aabb: "-0.5,-0.25,-0.05,0.25"
+  - type: Input
+    context: "ghost"
+  - type: Examiner
+    DoRangeCheck: false