diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
index e398d4b786..7dc463dd37 100644
--- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
+++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl
@@ -150,6 +150,20 @@ ent-CP14SpawnPointAdventurer = авантюрист
 
 ent-CP14SpawnPointAlchemist = алхимик
 
+ent-CP14ConstrainedSpawnerBase = None
+    .desc = lol
+
+ent-CP14ConstrainedSpawnerXeno = xeno constrained spawner
+    .desc = { ent-CP14ConstrainedSpawnerBase.desc }
+
+ent-CP14RandomSpawnerBattleRoyaleLootWeapon = Loot
+    .desc = lol
+    .suffix = Weapon
+
+ent-CP14RandomSpawnerBattleRoyaleLootTools = Loot
+    .desc = lol
+    .suffix = Tools
+
 ent-CP14RandomSpawnerGatherAgaricShroom = спавнер мухоморов
 
 ent-CP14RandomDirtLootSpawner = спавнер земли
@@ -189,16 +203,13 @@ ent-CP14BaseMobHuman = Мистер Человек
 
 ent-CP14BaseMobTiefling = Мистер Тифлинг
 
-ent-CP14OreCopper = медь
+ent-CP14OreCopper = медная руда
     .desc = Кусочек бледной, тяжелой меди.
 
-ent-CP14OreIron = железо
+ent-CP14OreIron = железная руда
     .desc = Кусочек холодного, тяжелого железа.
 
-ent-CP14OreSilver = серебро
-    .desc = Кусочек блестящего, теплого серебра.
-
-ent-CP14OreGold = золото
+ent-CP14OreGold = золотая руда
     .desc = Кусочек мягкого, чистого золота.
 
 ent-CP14CopperCoin = медная корона
@@ -381,12 +392,6 @@ ent-CP14Bucket = ведро
 ent-CP14OldLantern = Старая Лампа
     .desc = Пережиток прошлого техномагии. Большой, тяжелый, непрактичный. Таким приятно разве что бить по голове.
 
-ent-CP14Shovel = лопата
-    .desc = Орудие для вскапывания земли, рытья грядок или могил.
-
-ent-CP14Hoe = мотыга
-    .desc = Фермерский инструмент для подготовки почвы под посадки, либо очистки от сорняков.
-
 ent-CP14Rope = веревка
     .desc = Многофункциональная веревка. Ей можно связать что-нить. Или кого-нибудь.
 
@@ -429,6 +434,15 @@ ent-CP14BaseTwoHandedSword = двуручный меч
 ent-CP14TwoHandedSwordScythe = коса
     .desc = Большая двуручная коса. Что вы будете косить ею? Пшено, или головы своих врагов?
 
+ent-CP14BaseHoe = мотыга
+    .desc = Фермерский инструмент для подготовки почвы под посадки, либо очистки от сорняков.
+
+ent-CP14BasePickaxe = кирка
+    .desc = Идеально заточена, и готова вгрызаться в земную твердь.
+
+ent-CP14BaseShovel = лопата
+    .desc = Орудие для вскапывания земли, рытья грядок или могил.
+
 ent-CP14WeaponRevolverNavy = револьвер "Марин"
     .desc = Увесистый капсюльный револьвер серии "Марин". В настоящее время револьверы серии "Марин" стоят баснословные деньги, и их могут позволить себе исключительно преуспевающие моряки и торговцы.
 
@@ -721,6 +735,9 @@ ent-CP14WallmountBarShelfB = { ent-CP14WallmountBarShelfA }
     .desc = { ent-CP14WallmountBarShelfA.desc }
     .suffix = 2
 
+ent-CP14Workbench = верстак
+    .desc = Стол для создания различного базового инструментария.
+
 ent-CP14FrameWooden = каркас деревянной стены
     .desc = Деревянный каркас для деревянных стен любых видов.
 
@@ -831,10 +848,6 @@ ent-CP14WallStone = камень
 ent-CP14WallDirt = земляной холм
     .desc = bruh
 
-ent-CP14WallStoneSilverOre = { ent-CP14WallStone }
-    .desc = A solid stone natural wall. You see the tantalizing particles of silver in it.
-    .suffix = silver ore
-
 ent-CP14WallStoneGoldOre = { ent-CP14WallStone }
     .desc = A solid stone natural wall. You see the tantalizing particles of gold in it.
     .suffix = gold ore
@@ -901,6 +914,13 @@ ent-CP14WindowStoneBrick = окно в стене из каменного кир
 ent-CP14WindowWooden = wooden window
     .desc = A wooden wall with a glass window in it.
 
+ent-CP14OreSilver = серебро
+    .desc = Кусочек блестящего, теплого серебра.
+
+ent-CP14WallStoneSilverOre = { ent-CP14WallStone }
+    .desc = A solid stone natural wall. You see the tantalizing particles of silver in it.
+    .suffix = silver ore
+
 ent-CP14ClothingHeadWhiteBeret = белый берет
     .desc = Это берет.
 
diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml
index 28907bf8fb..cde8e0b2c1 100644
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml
@@ -2,6 +2,7 @@
   id: CP14ConstrainedSpawnerBase
   abstract: true
   parent: MarkerBase
+  description: lol
   components:
   - type: Sprite
     layers:
@@ -27,6 +28,7 @@
 - type: entity
   parent: CP14ConstrainedSpawnerBase
   id: CP14ConstrainedSpawnerXeno
+  name: xeno constrained spawner
   components:
   - type: TriggerOnCollide
     fixtureID: spawn
diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml
index e838548ff0..920d1e297f 100644
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml
@@ -1,7 +1,8 @@
 - type: entity
   id: CP14RandomSpawnerBattleRoyaleLootWeapon
-  name: Лут
+  name: Loot
   suffix: Weapon
+  description: lol
   parent: MarkerBase
   categories:
   - Spawner
@@ -31,7 +32,9 @@
     - CP14Crossbolt
     - CP14BaseSharpeningStone
     - CP14BaseSharpeningStone
-    - CP14Shovel
+    - CP14BaseShovel
+    - CP14BaseHoe
+    - CP14BasePickaxe
     - CP14OldLantern
     - ClothingBackpackCargo
     - ClothingBackpackCargo
@@ -53,8 +56,9 @@
 
 - type: entity
   id: CP14RandomSpawnerBattleRoyaleLootTools
-  name: Лут
+  name: Loot
   suffix: Tools
+  description: lol
   parent: MarkerBase
   categories:
   - Spawner
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/gardening.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/gardening.yml
deleted file mode 100644
index f3d98a8f72..0000000000
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/gardening.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-- type: entity
-  id: CP14Shovel
-  parent: BaseItem
-  name: shovel
-  description: An implement for digging up earth, digging beds or graves.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Tools/shovel.rsi
-    state: icon
-  - type: MeleeWeapon
-    wideAnimationRotation: 65
-    damage:
-      types:
-        Blunt: 5
-        Slash: 2
-    soundHit:
-      collection: MetalThud
-  - type: Item
-    size: Normal
-    sprite: _CP14/Objects/Tools/shovel.rsi
-  - type: ToolTileCompatible
-  - type: Tool
-    qualities:
-      - CP14Digging
-    useSound:
-      collection: CP14Digging
-      params:
-        variation: 0.03
-        volume: 2
-
-- type: entity
-  id: CP14Hoe
-  parent: BaseItem
-  name: hoe
-  description: A gardening tool to prepare the soil for planting, or to clear weeds
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Tools/hoe.rsi
-    state: icon
-  - type: MeleeWeapon
-    wideAnimationRotation: 65
-    damage:
-      types:
-        Piercing: 5
-        Slash: 2
-    soundHit:
-      collection: MetalThud
-  - type: Item
-    size: Normal
-    sprite: _CP14/Objects/Tools/hoe.rsi
-  - type: CP14SpawnOnTileTool
-    spawns:
-      CP14FloorDirt: CP14PloughedGround
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml
new file mode 100644
index 0000000000..64d082fd4f
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml
@@ -0,0 +1,27 @@
+- type: entity
+  id: CP14BaseHoe
+  parent: 
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponLight
+  name: hoe
+  description: A gardening tool to prepare the soil for planting, or to clear weeds
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Hoe/hoe.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: 65
+    damage:
+      types:
+        Piercing: 2
+        Slash: 2
+    soundHit:
+      collection: MetalThud
+  - type: Item
+    size: Normal
+    sprite: _CP14/Objects/Weapons/Melee/Hoe/hoe.rsi
+  - type: CP14SpawnOnTileTool
+    spawns:
+      CP14FloorDirt: CP14PloughedGround
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml
new file mode 100644
index 0000000000..1748ae043e
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml
@@ -0,0 +1,43 @@
+- type: entity
+  id: CP14BasePickaxe
+  parent: 
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  - CP14BaseWeaponChemical
+  name: pickaxe
+  description: Notched to perfection, for jamming it into rocks
+  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,0
+    - 1,1,1,2
+    sprite: _CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: 300
+    damage:
+      types:
+        Piercing: 5
+    soundHit:
+      collection: MetalThud
+  - type: IncreaseDamageOnWield
+    damage:
+      groups:
+        Brute: 5
+      types:
+        Structural: 10
+  - type: Wieldable
+  - type: ToolTileCompatible
+  - type: Tool
+    qualities:
+      - CP14Digging
+    useSound:
+      collection: CP14Digging
+      params:
+        variation: 0.03
+        volume: 2
+  - type: UseDelay
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml
new file mode 100644
index 0000000000..1fe9f7b878
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml
@@ -0,0 +1,32 @@
+- type: entity
+  id: CP14BaseShovel
+  parent: 
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  - CP14BaseWeaponSelfDamage
+  name: shovel
+  description: An implement for digging up earth, digging beds or graves.
+  components:
+  - type: Item
+    size: Normal
+    sprite: _CP14/Objects/Weapons/Melee/Shovel/shovel.rsi
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/Shovel/shovel.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: 65
+    damage:
+      types:
+        Blunt: 5
+        Slash: 2
+    soundHit:
+      collection: MetalThud
+  - type: ToolTileCompatible
+  - type: Tool
+    qualities:
+      - CP14Digging
+    useSound:
+      collection: CP14Digging
+      params:
+        variation: 0.03
+        volume: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml
index 5e63f234a6..545059eef4 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml
@@ -11,16 +11,15 @@
           ore1: ""
           ore2: ""
           ore3: ""
-          ore4: ""
 
 - type: entity
   id: CP14OreCopper
   parent: CP14BaseOre
-  name: copper piece
+  name: copper ore
   description: A piece of pale, heavy copper. 
   components:
   - type: Sprite
-    sprite: _CP14/Objects/Ores/ore_copper.rsi
+    sprite: _CP14/Objects/Materials/ore_copper.rsi
     layers:
       - state: ore1
         map: ["random"]
@@ -28,23 +27,11 @@
 - type: entity
   id: CP14OreIron
   parent: CP14BaseOre
-  name: iron piece
+  name: iron ore
   description: A piece of cold, heavy iron. 
   components:
   - type: Sprite
-    sprite: _CP14/Objects/Ores/ore_iron.rsi
-    layers:
-      - state: ore1
-        map: ["random"]
-
-- type: entity
-  id: CP14OreSilver
-  parent: CP14BaseOre
-  name: silver piece
-  description: A piece of shiny, warm silver.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Ores/ore_silver.rsi
+    sprite: _CP14/Objects/Materials/ore_iron.rsi
     layers:
       - state: ore1
         map: ["random"]
@@ -52,11 +39,11 @@
 - type: entity
   id: CP14OreGold
   parent: CP14BaseOre
-  name: gold piece
+  name: gold ore
   description: A piece of soft, pure gold.
   components:
   - type: Sprite
-    sprite: _CP14/Objects/Ores/ore_gold.rsi
+    sprite: _CP14/Objects/Materials/ore_gold.rsi
     layers:
       - state: ore1
         map: ["random"]
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
index 75cbb30c66..6062add2eb 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
@@ -127,39 +127,39 @@
 #            min: 1
 #            max: 5
 #
-- type: entity
-  id: CP14WallStoneSilverOre
-  suffix: silver ore
-  parent: CP14WallStone
-  description: A solid stone natural wall. You see the tantalizing particles of silver in it.
-  components:
-  - type: Sprite
-    sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi
-  - type: Icon
-    sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/break_stone.ogg
-          params:
-            volume: -6
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          CP14OreSilver:
-            min: 1
-            max: 5
-          CP14StoneBlock1:
-            min: 2
-            max: 3
-  - type: IconSmooth
-    base: wall
+#- type: entity
+#  id: CP14WallStoneSilverOre
+#  suffix: silver ore
+#  parent: CP14WallStone
+#  description: A solid stone natural wall. You see the tantalizing particles of silver in it.
+#  components:
+#  - type: Sprite
+#    sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi
+#  - type: Icon
+#    sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi
+#  - type: Destructible
+#    thresholds:
+#    - trigger:
+#        !type:DamageTrigger
+#        damage: 100
+#      behaviors:
+#      - !type:DoActsBehavior
+#        acts: ["Destruction"]
+#      - !type:PlaySoundBehavior
+#        sound:
+#          path: /Audio/Effects/break_stone.ogg
+#          params:
+#            volume: -6
+#      - !type:SpawnEntitiesBehavior
+#        spawn:
+#          CP14OreSilver:
+#            min: 1
+#            max: 5
+#          CP14StoneBlock1:
+#            min: 2
+#            max: 3
+#  - type: IconSmooth
+#    base: wall
 
 - type: entity
   id: CP14WallStoneGoldOre
diff --git a/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml b/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml
index 8f98b2b895..cbf81f9fe5 100644
--- a/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml
+++ b/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml
@@ -2,5 +2,5 @@
   id: CP14Gold
   name: gold ore
   sprite:
-    sprite: _CP14/Objects/Ores/ore_gold.rsi
+    sprite: _CP14/Objects/Materials/ore_gold.rsi
     state: ore1
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template.yml b/Resources/Prototypes/_CP14/Procedural/biome_template.yml
index b057eda164..3f2a9eaea9 100644
--- a/Resources/Prototypes/_CP14/Procedural/biome_template.yml
+++ b/Resources/Prototypes/_CP14/Procedural/biome_template.yml
@@ -117,17 +117,6 @@
       entities:
         - CP14WallStone
     #Ores
-    - !type:BiomeEntityLayer
-      threshold: 0.6
-      noise:
-        seed: 0
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        frequency: 3
-      allowedTiles:
-        - CP14FloorBase
-      entities:
-        - CP14WallStoneSilverOre
     - !type:BiomeEntityLayer
       threshold: 0.6
       noise:
diff --git a/Resources/Prototypes/_CP14/tools.yml b/Resources/Prototypes/_CP14/tools.yml
index 1c5d47e8b1..5db184019f 100644
--- a/Resources/Prototypes/_CP14/tools.yml
+++ b/Resources/Prototypes/_CP14/tools.yml
@@ -2,8 +2,8 @@
   id: CP14Digging
   name: cp14-tool-quality-digging-name
   toolName: cp14-tool-quality-digging-tool-name
-  spawn: CP14Shovel
-  icon: { sprite: _CP14/Objects/Tools/shovel.rsi, state: icon}
+  spawn: CP14BaseShovel
+  icon: { sprite: _CP14/Objects/Weapons/Melee/Shovel/shovel.rsi, state: icon}
 
 - type:  tool
   id: CP14Hammering
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/meta.json
similarity index 90%
rename from Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/meta.json
index 112f49c67d..bde7103551 100644
--- a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/meta.json
@@ -15,9 +15,6 @@
     },
     {
       "name": "ore3"
-    },
-    {
-      "name": "ore4"
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore1.png
new file mode 100644
index 0000000000..4dbc9dad07
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore1.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore2.png
new file mode 100644
index 0000000000..8f7fd68ca7
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore2.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore3.png
new file mode 100644
index 0000000000..6d47f0c704
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore3.png differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/meta.json
similarity index 90%
rename from Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/meta.json
index 112f49c67d..bde7103551 100644
--- a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/meta.json
@@ -15,9 +15,6 @@
     },
     {
       "name": "ore3"
-    },
-    {
-      "name": "ore4"
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore1.png
new file mode 100644
index 0000000000..c5cac76c00
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore1.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore2.png
new file mode 100644
index 0000000000..d48cf306b5
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore2.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore3.png
new file mode 100644
index 0000000000..e7dfb634cc
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore3.png differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/meta.json
similarity index 90%
rename from Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/meta.json
index 112f49c67d..bde7103551 100644
--- a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/meta.json
@@ -15,9 +15,6 @@
     },
     {
       "name": "ore3"
-    },
-    {
-      "name": "ore4"
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore1.png
new file mode 100644
index 0000000000..c707a6c652
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore1.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore2.png
new file mode 100644
index 0000000000..e46f90f02b
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore2.png differ
diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore3.png
new file mode 100644
index 0000000000..98e9eb4d0b
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore3.png differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore1.png
deleted file mode 100644
index 0a2c9c7372..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore2.png
deleted file mode 100644
index d1dbc770d6..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore3.png
deleted file mode 100644
index aa0414ebad..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore3.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore4.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore4.png
deleted file mode 100644
index 4ee6a4e72b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore4.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore1.png
deleted file mode 100644
index ca62cc342b..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore2.png
deleted file mode 100644
index 503e979a33..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore3.png
deleted file mode 100644
index 31c2ad8d05..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore3.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore4.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore4.png
deleted file mode 100644
index c1f4e2d30c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore4.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore1.png
deleted file mode 100644
index b90f349170..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore2.png
deleted file mode 100644
index 8408bd0c27..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore3.png
deleted file mode 100644
index 5116db395c..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore3.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore4.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore4.png
deleted file mode 100644
index 27dc2e89c9..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore4.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json
deleted file mode 100644
index 112f49c67d..0000000000
--- a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "All rights reserved for the CrystallPunk14 project only",
-  "copyright": "Created by TheShuEd (Github) for CrystallPunk14",
-  "states": [
-    {
-      "name": "ore1"
-    },
-    {
-      "name": "ore2"
-    },
-    {
-      "name": "ore3"
-    },
-    {
-      "name": "ore4"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore1.png
deleted file mode 100644
index c6d14dcfdf..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore1.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore2.png
deleted file mode 100644
index ed988b27a0..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore2.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore3.png
deleted file mode 100644
index fe9e1cc29e..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore3.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore4.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore4.png
deleted file mode 100644
index 0ec07b2c7d..0000000000
Binary files a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore4.png and /dev/null differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/hoe.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/hoe.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/Tools/hoe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/hoe.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/Tools/hoe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/hoe.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/Tools/hoe.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/hoe.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/meta.json
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/icon.png
new file mode 100644
index 0000000000..51246cba69
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/icon.png differ
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-left.png
new file mode 100644
index 0000000000..27a0176c62
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-right.png
new file mode 100644
index 0000000000..13b955f535
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/meta.json
new file mode 100644
index 0000000000..f201495441
--- /dev/null
+++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..0200d4afb6
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..4d321de7c9
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/shovel.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/shovel.rsi/icon.png
rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/shovel.rsi/icon.png
diff --git a/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/shovel.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-left.png
rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/shovel.rsi/inhand-left.png
diff --git a/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/shovel.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/shovel.rsi/inhand-right.png
rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/shovel.rsi/inhand-right.png
diff --git a/Resources/Textures/_CP14/Objects/Tools/shovel.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/shovel.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_CP14/Objects/Tools/shovel.rsi/meta.json
rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/shovel.rsi/meta.json
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 6172573eeb..31c850b084 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -13,7 +13,7 @@ CP14CardboardWall: CP14WallCardboard
 
 # 2024-06-06
 CP14CaveStoneWall: CP14WallStone
-CP14CaveStoneWallSilverOre: CP14WallStoneSilverOre
+CP14CaveStoneWallSilverOre: null
 CP14CaveStoneWallGoldOre: CP14WallStoneGoldOre
 
 # 2024-06-07
@@ -29,6 +29,9 @@ CP14ClothingShirtHarlequineRed: CP14ClothingShirtCottonBlack
 
 # 2024-07-18
 CP14ClothingShirtCottonBlueDark: CP14ClothingShirtCottonBlack
+CP14Shovel: CP14BaseShovel
+CP14Hoe: CP14BaseHoe
+CP14WallStoneSilverOre: CP14WallStoneGoldOre
 
 # <---> CrystallPunk migration zone end