reorganized items, objects, and rooms in directories. oranized module names. added startup checks.

441 files changed, 36 insertions, 36 deletions

diff --git a/data/items/adamant_arrow.yaml b/data/items/ammo/adamant_arrow.yaml
index bbcdcab..bbcdcab 100644
--- a/data/items/adamant_arrow.yaml
+++ b/data/items/ammo/adamant_arrow.yaml
diff --git a/data/items/adamant_arrowtips.yaml b/data/items/ammo/adamant_arrowtips.yaml
index 49ddb57..49ddb57 100644
--- a/data/items/adamant_arrowtips.yaml
+++ b/data/items/ammo/adamant_arrowtips.yaml
diff --git a/data/items/adamant_bolts.yaml b/data/items/ammo/adamant_bolts.yaml
index 47d088f..47d088f 100644
--- a/data/items/adamant_bolts.yaml
+++ b/data/items/ammo/adamant_bolts.yaml
diff --git a/data/items/adamant_bolts_unf.yaml b/data/items/ammo/adamant_bolts_unf.yaml
index db709db..db709db 100644
--- a/data/items/adamant_bolts_unf.yaml
+++ b/data/items/ammo/adamant_bolts_unf.yaml
diff --git a/data/items/arrow_shaft.yaml b/data/items/ammo/arrow_shaft.yaml
index 715a3e6..715a3e6 100644
--- a/data/items/arrow_shaft.yaml
+++ b/data/items/ammo/arrow_shaft.yaml
diff --git a/data/items/bronze_arrow.yaml b/data/items/ammo/bronze_arrow.yaml
index eb73a48..eb73a48 100644
--- a/data/items/bronze_arrow.yaml
+++ b/data/items/ammo/bronze_arrow.yaml
diff --git a/data/items/bronze_arrowtips.yaml b/data/items/ammo/bronze_arrowtips.yaml
index df42e59..df42e59 100644
--- a/data/items/bronze_arrowtips.yaml
+++ b/data/items/ammo/bronze_arrowtips.yaml
diff --git a/data/items/bronze_bolts.yaml b/data/items/ammo/bronze_bolts.yaml
index 0d3afae..0d3afae 100644
--- a/data/items/bronze_bolts.yaml
+++ b/data/items/ammo/bronze_bolts.yaml
diff --git a/data/items/bronze_bolts_unf.yaml b/data/items/ammo/bronze_bolts_unf.yaml
index 538d8ab..538d8ab 100644
--- a/data/items/bronze_bolts_unf.yaml
+++ b/data/items/ammo/bronze_bolts_unf.yaml
diff --git a/data/items/diamond_bolt_tips.yaml b/data/items/ammo/diamond_bolt_tips.yaml
index 1529b11..1529b11 100644
--- a/data/items/diamond_bolt_tips.yaml
+++ b/data/items/ammo/diamond_bolt_tips.yaml
diff --git a/data/items/diamond_bolts.yaml b/data/items/ammo/diamond_bolts.yaml
index efe8013..efe8013 100644
--- a/data/items/diamond_bolts.yaml
+++ b/data/items/ammo/diamond_bolts.yaml
diff --git a/data/items/diamond_bolts_e.yaml b/data/items/ammo/diamond_bolts_e.yaml
index 93ade4c..93ade4c 100644
--- a/data/items/diamond_bolts_e.yaml
+++ b/data/items/ammo/diamond_bolts_e.yaml
diff --git a/data/items/emerald_bolt_tips.yaml b/data/items/ammo/emerald_bolt_tips.yaml
index afd285b..afd285b 100644
--- a/data/items/emerald_bolt_tips.yaml
+++ b/data/items/ammo/emerald_bolt_tips.yaml
diff --git a/data/items/emerald_bolts.yaml b/data/items/ammo/emerald_bolts.yaml
index 1afdcd0..1afdcd0 100644
--- a/data/items/emerald_bolts.yaml
+++ b/data/items/ammo/emerald_bolts.yaml
diff --git a/data/items/emerald_bolts_e.yaml b/data/items/ammo/emerald_bolts_e.yaml
index 4cb7cbd..4cb7cbd 100644
--- a/data/items/emerald_bolts_e.yaml
+++ b/data/items/ammo/emerald_bolts_e.yaml
diff --git a/data/items/headless_arrow.yaml b/data/items/ammo/headless_arrow.yaml
index acf1384..acf1384 100644
--- a/data/items/headless_arrow.yaml
+++ b/data/items/ammo/headless_arrow.yaml
diff --git a/data/items/iron_arrow.yaml b/data/items/ammo/iron_arrow.yaml
index ebadaec..ebadaec 100644
--- a/data/items/iron_arrow.yaml
+++ b/data/items/ammo/iron_arrow.yaml
diff --git a/data/items/iron_arrowtips.yaml b/data/items/ammo/iron_arrowtips.yaml
index 54ffd11..54ffd11 100644
--- a/data/items/iron_arrowtips.yaml
+++ b/data/items/ammo/iron_arrowtips.yaml
diff --git a/data/items/iron_bolts.yaml b/data/items/ammo/iron_bolts.yaml
index ed81578..ed81578 100644
--- a/data/items/iron_bolts.yaml
+++ b/data/items/ammo/iron_bolts.yaml
diff --git a/data/items/iron_bolts_unf.yaml b/data/items/ammo/iron_bolts_unf.yaml
index 0a51ca0..0a51ca0 100644
--- a/data/items/iron_bolts_unf.yaml
+++ b/data/items/ammo/iron_bolts_unf.yaml
diff --git a/data/items/mithril_arrow.yaml b/data/items/ammo/mithril_arrow.yaml
index 23464e9..23464e9 100644
--- a/data/items/mithril_arrow.yaml
+++ b/data/items/ammo/mithril_arrow.yaml
diff --git a/data/items/mithril_arrowtips.yaml b/data/items/ammo/mithril_arrowtips.yaml
index 8f68a34..8f68a34 100644
--- a/data/items/mithril_arrowtips.yaml
+++ b/data/items/ammo/mithril_arrowtips.yaml
diff --git a/data/items/mithril_bolts.yaml b/data/items/ammo/mithril_bolts.yaml
index e160065..e160065 100644
--- a/data/items/mithril_bolts.yaml
+++ b/data/items/ammo/mithril_bolts.yaml
diff --git a/data/items/mithril_bolts_unf.yaml b/data/items/ammo/mithril_bolts_unf.yaml
index 8015f1a..8015f1a 100644
--- a/data/items/mithril_bolts_unf.yaml
+++ b/data/items/ammo/mithril_bolts_unf.yaml
diff --git a/data/items/ruby_bolt_tips.yaml b/data/items/ammo/ruby_bolt_tips.yaml
index 6ebe1a0..6ebe1a0 100644
--- a/data/items/ruby_bolt_tips.yaml
+++ b/data/items/ammo/ruby_bolt_tips.yaml
diff --git a/data/items/ruby_bolts.yaml b/data/items/ammo/ruby_bolts.yaml
index b83bec2..b83bec2 100644
--- a/data/items/ruby_bolts.yaml
+++ b/data/items/ammo/ruby_bolts.yaml
diff --git a/data/items/ruby_bolts_e.yaml b/data/items/ammo/ruby_bolts_e.yaml
index 14954c2..14954c2 100644
--- a/data/items/ruby_bolts_e.yaml
+++ b/data/items/ammo/ruby_bolts_e.yaml
diff --git a/data/items/rune_arrow.yaml b/data/items/ammo/rune_arrow.yaml
index b00e922..b00e922 100644
--- a/data/items/rune_arrow.yaml
+++ b/data/items/ammo/rune_arrow.yaml
diff --git a/data/items/rune_arrowtips.yaml b/data/items/ammo/rune_arrowtips.yaml
index c2d80e0..c2d80e0 100644
--- a/data/items/rune_arrowtips.yaml
+++ b/data/items/ammo/rune_arrowtips.yaml
diff --git a/data/items/rune_bolts.yaml b/data/items/ammo/rune_bolts.yaml
index 82ac597..82ac597 100644
--- a/data/items/rune_bolts.yaml
+++ b/data/items/ammo/rune_bolts.yaml
diff --git a/data/items/rune_bolts_unf.yaml b/data/items/ammo/rune_bolts_unf.yaml
index ecaf494..ecaf494 100644
--- a/data/items/rune_bolts_unf.yaml
+++ b/data/items/ammo/rune_bolts_unf.yaml
diff --git a/data/items/sapphire_bolt_tips.yaml b/data/items/ammo/sapphire_bolt_tips.yaml
index 7513fd3..7513fd3 100644
--- a/data/items/sapphire_bolt_tips.yaml
+++ b/data/items/ammo/sapphire_bolt_tips.yaml
diff --git a/data/items/sapphire_bolts.yaml b/data/items/ammo/sapphire_bolts.yaml
index a7102c9..a7102c9 100644
--- a/data/items/sapphire_bolts.yaml
+++ b/data/items/ammo/sapphire_bolts.yaml
diff --git a/data/items/sapphire_bolts_e.yaml b/data/items/ammo/sapphire_bolts_e.yaml
index dc378cc..dc378cc 100644
--- a/data/items/sapphire_bolts_e.yaml
+++ b/data/items/ammo/sapphire_bolts_e.yaml
diff --git a/data/items/steel_arrow.yaml b/data/items/ammo/steel_arrow.yaml
index e14171f..e14171f 100644
--- a/data/items/steel_arrow.yaml
+++ b/data/items/ammo/steel_arrow.yaml
diff --git a/data/items/steel_arrowtips.yaml b/data/items/ammo/steel_arrowtips.yaml
index 49000d2..49000d2 100644
--- a/data/items/steel_arrowtips.yaml
+++ b/data/items/ammo/steel_arrowtips.yaml
diff --git a/data/items/steel_bolts.yaml b/data/items/ammo/steel_bolts.yaml
index 7dfadf1..7dfadf1 100644
--- a/data/items/steel_bolts.yaml
+++ b/data/items/ammo/steel_bolts.yaml
diff --git a/data/items/steel_bolts_unf.yaml b/data/items/ammo/steel_bolts_unf.yaml
index b65d5fa..b65d5fa 100644
--- a/data/items/steel_bolts_unf.yaml
+++ b/data/items/ammo/steel_bolts_unf.yaml
diff --git a/data/items/acid_vial.yaml b/data/items/consumables/acid_vial.yaml
index 7a49e2d..7a49e2d 100644
--- a/data/items/acid_vial.yaml
+++ b/data/items/consumables/acid_vial.yaml
diff --git a/data/items/amp_potion.yaml b/data/items/consumables/amp_potion.yaml
index 8167932..8167932 100644
--- a/data/items/amp_potion.yaml
+++ b/data/items/consumables/amp_potion.yaml
diff --git a/data/items/anchovies.yaml b/data/items/consumables/anchovies.yaml
index 0abd846..0abd846 100644
--- a/data/items/anchovies.yaml
+++ b/data/items/consumables/anchovies.yaml
diff --git a/data/items/antitoxin_powder.yaml b/data/items/consumables/antitoxin_powder.yaml
index dedba43..dedba43 100644
--- a/data/items/antitoxin_powder.yaml
+++ b/data/items/consumables/antitoxin_powder.yaml
diff --git a/data/items/apple.yaml b/data/items/consumables/apple.yaml
index 10c09c1..10c09c1 100644
--- a/data/items/apple.yaml
+++ b/data/items/consumables/apple.yaml
diff --git a/data/items/avantoe_potion_unf.yaml b/data/items/consumables/avantoe_potion_unf.yaml
index 8b23f35..62f2218 100644
--- a/data/items/avantoe_potion_unf.yaml
+++ b/data/items/consumables/avantoe_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 50
 stackable: false
 made_from:
   - items: [avantoe]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/bio_serum.yaml b/data/items/consumables/bio_serum.yaml
index b397e46..b397e46 100644
--- a/data/items/bio_serum.yaml
+++ b/data/items/consumables/bio_serum.yaml
diff --git a/data/items/blight_spore.yaml b/data/items/consumables/blight_spore.yaml
index add0f6e..add0f6e 100644
--- a/data/items/blight_spore.yaml
+++ b/data/items/consumables/blight_spore.yaml
diff --git a/data/items/bread.yaml b/data/items/consumables/bread.yaml
index 68cefdc..68cefdc 100644
--- a/data/items/bread.yaml
+++ b/data/items/consumables/bread.yaml
diff --git a/data/items/bread_dough.yaml b/data/items/consumables/bread_dough.yaml
index 98ab297..73ac998 100644
--- a/data/items/bread_dough.yaml
+++ b/data/items/consumables/bread_dough.yaml
@@ -7,8 +7,8 @@ stackable: false
 ticks: 2
 made_from:
   - items: [pot_of_flour]
-    qty: 1
+    quantity: 1
     byproducts: [empty_pot]
   - items: [bucket_of_water, jug_of_water]
-    qty: 1
+    quantity: 1
     byproducts: [empty_bucket, empty_jug]
diff --git a/data/items/bucket_of_water.yaml b/data/items/consumables/bucket_of_water.yaml
index 3449cdd..3449cdd 100644
--- a/data/items/bucket_of_water.yaml
+++ b/data/items/consumables/bucket_of_water.yaml
diff --git a/data/items/burnt_fish.yaml b/data/items/consumables/burnt_fish.yaml
index 7af9f03..7af9f03 100644
--- a/data/items/burnt_fish.yaml
+++ b/data/items/consumables/burnt_fish.yaml
diff --git a/data/items/burnt_meat.yaml b/data/items/consumables/burnt_meat.yaml
index 92c339c..92c339c 100644
--- a/data/items/burnt_meat.yaml
+++ b/data/items/consumables/burnt_meat.yaml
diff --git a/data/items/cabbage.yaml b/data/items/consumables/cabbage.yaml
index c04fd4e..c04fd4e 100644
--- a/data/items/cabbage.yaml
+++ b/data/items/consumables/cabbage.yaml
diff --git a/data/items/cadantine_potion_unf.yaml b/data/items/consumables/cadantine_potion_unf.yaml
index 416d938..d1f13c6 100644
--- a/data/items/cadantine_potion_unf.yaml
+++ b/data/items/consumables/cadantine_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 72
 stackable: false
 made_from:
   - items: [cadantine]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/catalyst_wine.yaml b/data/items/consumables/catalyst_wine.yaml
index fcfe1a0..fcfe1a0 100644
--- a/data/items/catalyst_wine.yaml
+++ b/data/items/consumables/catalyst_wine.yaml
diff --git a/data/items/cheese.yaml b/data/items/consumables/cheese.yaml
index 79d9fe8..79d9fe8 100644
--- a/data/items/cheese.yaml
+++ b/data/items/consumables/cheese.yaml
diff --git a/data/items/dwarf_weed_potion_unf.yaml b/data/items/consumables/dwarf_weed_potion_unf.yaml
index 1a9516e..64f7faa 100644
--- a/data/items/dwarf_weed_potion_unf.yaml
+++ b/data/items/consumables/dwarf_weed_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 88
 stackable: false
 made_from:
   - items: [dwarf_weed]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/full_restore.yaml b/data/items/consumables/full_restore.yaml
index 96f6036..96f6036 100644
--- a/data/items/full_restore.yaml
+++ b/data/items/consumables/full_restore.yaml
diff --git a/data/items/guam_potion_unf.yaml b/data/items/consumables/guam_potion_unf.yaml
index 970a9d2..ba81e93 100644
--- a/data/items/guam_potion_unf.yaml
+++ b/data/items/consumables/guam_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 5
 stackable: false
 made_from:
   - items: [guam]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/harralander_potion_unf.yaml b/data/items/consumables/harralander_potion_unf.yaml
index bd578c2..522f8ea 100644
--- a/data/items/harralander_potion_unf.yaml
+++ b/data/items/consumables/harralander_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 18
 stackable: false
 made_from:
   - items: [harralander]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/herring.yaml b/data/items/consumables/herring.yaml
index adbbd95..adbbd95 100644
--- a/data/items/herring.yaml
+++ b/data/items/consumables/herring.yaml
diff --git a/data/items/irit_potion_unf.yaml b/data/items/consumables/irit_potion_unf.yaml
index d10a19a..76a8577 100644
--- a/data/items/irit_potion_unf.yaml
+++ b/data/items/consumables/irit_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 42
 stackable: false
 made_from:
   - items: [irit]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/jug_of_water.yaml b/data/items/consumables/jug_of_water.yaml
index 04d3b8f..04d3b8f 100644
--- a/data/items/jug_of_water.yaml
+++ b/data/items/consumables/jug_of_water.yaml
diff --git a/data/items/kwuarm_potion_unf.yaml b/data/items/consumables/kwuarm_potion_unf.yaml
index 750a47a..0448145 100644
--- a/data/items/kwuarm_potion_unf.yaml
+++ b/data/items/consumables/kwuarm_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 56
 stackable: false
 made_from:
   - items: [kwuarm]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/lantadyme_potion_unf.yaml b/data/items/consumables/lantadyme_potion_unf.yaml
index bc66c3c..3460a18 100644
--- a/data/items/lantadyme_potion_unf.yaml
+++ b/data/items/consumables/lantadyme_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 80
 stackable: false
 made_from:
   - items: [lantadyme]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/marrentill_potion_unf.yaml b/data/items/consumables/marrentill_potion_unf.yaml
index e7b3817..4424e5e 100644
--- a/data/items/marrentill_potion_unf.yaml
+++ b/data/items/consumables/marrentill_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 8
 stackable: false
 made_from:
   - items: [marrentill]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/nano_restore.yaml b/data/items/consumables/nano_restore.yaml
index e430b49..e430b49 100644
--- a/data/items/nano_restore.yaml
+++ b/data/items/consumables/nano_restore.yaml
diff --git a/data/items/onion.yaml b/data/items/consumables/onion.yaml
index 0d0aca7..0d0aca7 100644
--- a/data/items/onion.yaml
+++ b/data/items/consumables/onion.yaml
diff --git a/data/items/pastry_dough.yaml b/data/items/consumables/pastry_dough.yaml
index c08c0ae..b607c83 100644
--- a/data/items/pastry_dough.yaml
+++ b/data/items/consumables/pastry_dough.yaml
@@ -6,6 +6,6 @@ value: 3
 stackable: false
 made_from:
   - items: [pot_of_flour]
-    qty: 1
+    quantity: 1
   - items: [bucket_of_water]
-    qty: 1
+    quantity: 1
diff --git a/data/items/pie_dish.yaml b/data/items/consumables/pie_dish.yaml
index bd6100b..bd6100b 100644
--- a/data/items/pie_dish.yaml
+++ b/data/items/consumables/pie_dish.yaml
diff --git a/data/items/pizza_dough.yaml b/data/items/consumables/pizza_dough.yaml
index 1105c60..12d8b14 100644
--- a/data/items/pizza_dough.yaml
+++ b/data/items/consumables/pizza_dough.yaml
@@ -6,6 +6,6 @@ value: 3
 stackable: false
 made_from:
   - items: [pot_of_flour]
-    qty: 1
+    quantity: 1
   - items: [bucket_of_water]
-    qty: 1
+    quantity: 1
diff --git a/data/items/plant_cure.yaml b/data/items/consumables/plant_cure.yaml
index 64ebe91..64ebe91 100644
--- a/data/items/plant_cure.yaml
+++ b/data/items/consumables/plant_cure.yaml
diff --git a/data/items/pot_of_flour.yaml b/data/items/consumables/pot_of_flour.yaml
index c05c065..c05c065 100644
--- a/data/items/pot_of_flour.yaml
+++ b/data/items/consumables/pot_of_flour.yaml
diff --git a/data/items/potato.yaml b/data/items/consumables/potato.yaml
index d9f521a..d9f521a 100644
--- a/data/items/potato.yaml
+++ b/data/items/consumables/potato.yaml
diff --git a/data/items/ranarr_potion_unf.yaml b/data/items/consumables/ranarr_potion_unf.yaml
index 373abb6..d2c475d 100644
--- a/data/items/ranarr_potion_unf.yaml
+++ b/data/items/consumables/ranarr_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 38
 stackable: false
 made_from:
   - items: [ranarr]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/raw_anchovies.yaml b/data/items/consumables/raw_anchovies.yaml
index cf5b75f..cf5b75f 100644
--- a/data/items/raw_anchovies.yaml
+++ b/data/items/consumables/raw_anchovies.yaml
diff --git a/data/items/raw_anglerfish.yaml b/data/items/consumables/raw_anglerfish.yaml
index b1c7262..b1c7262 100644
--- a/data/items/raw_anglerfish.yaml
+++ b/data/items/consumables/raw_anglerfish.yaml
diff --git a/data/items/raw_bass.yaml b/data/items/consumables/raw_bass.yaml
index 34dddc1..34dddc1 100644
--- a/data/items/raw_bass.yaml
+++ b/data/items/consumables/raw_bass.yaml
diff --git a/data/items/raw_beef.yaml b/data/items/consumables/raw_beef.yaml
index 59695b0..59695b0 100644
--- a/data/items/raw_beef.yaml
+++ b/data/items/consumables/raw_beef.yaml
diff --git a/data/items/raw_cave_eel.yaml b/data/items/consumables/raw_cave_eel.yaml
index 000f93c..000f93c 100644
--- a/data/items/raw_cave_eel.yaml
+++ b/data/items/consumables/raw_cave_eel.yaml
diff --git a/data/items/raw_cod.yaml b/data/items/consumables/raw_cod.yaml
index fe94f35..fe94f35 100644
--- a/data/items/raw_cod.yaml
+++ b/data/items/consumables/raw_cod.yaml
diff --git a/data/items/raw_herring.yaml b/data/items/consumables/raw_herring.yaml
index 730eca5..730eca5 100644
--- a/data/items/raw_herring.yaml
+++ b/data/items/consumables/raw_herring.yaml
diff --git a/data/items/raw_lobster.yaml b/data/items/consumables/raw_lobster.yaml
index 908c931..908c931 100644
--- a/data/items/raw_lobster.yaml
+++ b/data/items/consumables/raw_lobster.yaml
diff --git a/data/items/raw_mackerel.yaml b/data/items/consumables/raw_mackerel.yaml
index 42e1d09..42e1d09 100644
--- a/data/items/raw_mackerel.yaml
+++ b/data/items/consumables/raw_mackerel.yaml
diff --git a/data/items/raw_pike.yaml b/data/items/consumables/raw_pike.yaml
index 625c019..625c019 100644
--- a/data/items/raw_pike.yaml
+++ b/data/items/consumables/raw_pike.yaml
diff --git a/data/items/raw_rainbow_fish.yaml b/data/items/consumables/raw_rainbow_fish.yaml
index 311c9f1..311c9f1 100644
--- a/data/items/raw_rainbow_fish.yaml
+++ b/data/items/consumables/raw_rainbow_fish.yaml
diff --git a/data/items/raw_salmon.yaml b/data/items/consumables/raw_salmon.yaml
index d5ae9bd..d5ae9bd 100644
--- a/data/items/raw_salmon.yaml
+++ b/data/items/consumables/raw_salmon.yaml
diff --git a/data/items/raw_sardine.yaml b/data/items/consumables/raw_sardine.yaml
index d27a155..d27a155 100644
--- a/data/items/raw_sardine.yaml
+++ b/data/items/consumables/raw_sardine.yaml
diff --git a/data/items/raw_shark.yaml b/data/items/consumables/raw_shark.yaml
index 999ccb9..999ccb9 100644
--- a/data/items/raw_shark.yaml
+++ b/data/items/consumables/raw_shark.yaml
diff --git a/data/items/raw_shrimps.yaml b/data/items/consumables/raw_shrimps.yaml
index 1127fda..1127fda 100644
--- a/data/items/raw_shrimps.yaml
+++ b/data/items/consumables/raw_shrimps.yaml
diff --git a/data/items/raw_slimy_eel.yaml b/data/items/consumables/raw_slimy_eel.yaml
index 40820e5..40820e5 100644
--- a/data/items/raw_slimy_eel.yaml
+++ b/data/items/consumables/raw_slimy_eel.yaml
diff --git a/data/items/raw_swordfish.yaml b/data/items/consumables/raw_swordfish.yaml
index e162460..e162460 100644
--- a/data/items/raw_swordfish.yaml
+++ b/data/items/consumables/raw_swordfish.yaml
diff --git a/data/items/raw_trout.yaml b/data/items/consumables/raw_trout.yaml
index c1d98aa..c1d98aa 100644
--- a/data/items/raw_trout.yaml
+++ b/data/items/consumables/raw_trout.yaml
diff --git a/data/items/raw_tuna.yaml b/data/items/consumables/raw_tuna.yaml
index 6079f92..6079f92 100644
--- a/data/items/raw_tuna.yaml
+++ b/data/items/consumables/raw_tuna.yaml
diff --git a/data/items/restoration_compound.yaml b/data/items/consumables/restoration_compound.yaml
index 913153f..913153f 100644
--- a/data/items/restoration_compound.yaml
+++ b/data/items/consumables/restoration_compound.yaml
diff --git a/data/items/salmon.yaml b/data/items/consumables/salmon.yaml
index 59b8237..59b8237 100644
--- a/data/items/salmon.yaml
+++ b/data/items/consumables/salmon.yaml
diff --git a/data/items/sardine.yaml b/data/items/consumables/sardine.yaml
index c11b42b..c11b42b 100644
--- a/data/items/sardine.yaml
+++ b/data/items/consumables/sardine.yaml
diff --git a/data/items/science_serum.yaml b/data/items/consumables/science_serum.yaml
index e78f915..e78f915 100644
--- a/data/items/science_serum.yaml
+++ b/data/items/consumables/science_serum.yaml
diff --git a/data/items/shield_potion.yaml b/data/items/consumables/shield_potion.yaml
index 4cd91e8..4cd91e8 100644
--- a/data/items/shield_potion.yaml
+++ b/data/items/consumables/shield_potion.yaml
diff --git a/data/items/shrimps.yaml b/data/items/consumables/shrimps.yaml
index 9c280c8..9c280c8 100644
--- a/data/items/shrimps.yaml
+++ b/data/items/consumables/shrimps.yaml
diff --git a/data/items/snapdragon_potion_unf.yaml b/data/items/consumables/snapdragon_potion_unf.yaml
index ac3aba3..ee8e366 100644
--- a/data/items/snapdragon_potion_unf.yaml
+++ b/data/items/consumables/snapdragon_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 68
 stackable: false
 made_from:
   - items: [snapdragon]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/stim_potion.yaml b/data/items/consumables/stim_potion.yaml
index de51291..de51291 100644
--- a/data/items/stim_potion.yaml
+++ b/data/items/consumables/stim_potion.yaml
diff --git a/data/items/strawberry.yaml b/data/items/consumables/strawberry.yaml
index 337a65e..337a65e 100644
--- a/data/items/strawberry.yaml
+++ b/data/items/consumables/strawberry.yaml
diff --git a/data/items/super_amp.yaml b/data/items/consumables/super_amp.yaml
index 3bea59b..3bea59b 100644
--- a/data/items/super_amp.yaml
+++ b/data/items/consumables/super_amp.yaml
diff --git a/data/items/super_bio_serum.yaml b/data/items/consumables/super_bio_serum.yaml
index fbc5ebe..fbc5ebe 100644
--- a/data/items/super_bio_serum.yaml
+++ b/data/items/consumables/super_bio_serum.yaml
diff --git a/data/items/super_shield.yaml b/data/items/consumables/super_shield.yaml
index 7545b2e..7545b2e 100644
--- a/data/items/super_shield.yaml
+++ b/data/items/consumables/super_shield.yaml
diff --git a/data/items/super_stim.yaml b/data/items/consumables/super_stim.yaml
index c290c5f..c290c5f 100644
--- a/data/items/super_stim.yaml
+++ b/data/items/consumables/super_stim.yaml
diff --git a/data/items/super_stim_cell.yaml b/data/items/consumables/super_stim_cell.yaml
index 1f25597..1f25597 100644
--- a/data/items/super_stim_cell.yaml
+++ b/data/items/consumables/super_stim_cell.yaml
diff --git a/data/items/sweetcorn.yaml b/data/items/consumables/sweetcorn.yaml
index 32f5a70..32f5a70 100644
--- a/data/items/sweetcorn.yaml
+++ b/data/items/consumables/sweetcorn.yaml
diff --git a/data/items/targeting_serum.yaml b/data/items/consumables/targeting_serum.yaml
index b10ebc5..b10ebc5 100644
--- a/data/items/targeting_serum.yaml
+++ b/data/items/consumables/targeting_serum.yaml
diff --git a/data/items/tarromin_potion_unf.yaml b/data/items/consumables/tarromin_potion_unf.yaml
index 6a3fab6..abc6438 100644
--- a/data/items/tarromin_potion_unf.yaml
+++ b/data/items/consumables/tarromin_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 12
 stackable: false
 made_from:
   - items: [tarromin]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/tech_serum.yaml b/data/items/consumables/tech_serum.yaml
index aac3fdc..aac3fdc 100644
--- a/data/items/tech_serum.yaml
+++ b/data/items/consumables/tech_serum.yaml
diff --git a/data/items/toadflax_potion_unf.yaml b/data/items/consumables/toadflax_potion_unf.yaml
index ca2a123..f05b406 100644
--- a/data/items/toadflax_potion_unf.yaml
+++ b/data/items/consumables/toadflax_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 28
 stackable: false
 made_from:
   - items: [toadflax]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/tomato.yaml b/data/items/consumables/tomato.yaml
index d2ad349..d2ad349 100644
--- a/data/items/tomato.yaml
+++ b/data/items/consumables/tomato.yaml
diff --git a/data/items/torstol_potion_unf.yaml b/data/items/consumables/torstol_potion_unf.yaml
index f5816d2..cf551df 100644
--- a/data/items/torstol_potion_unf.yaml
+++ b/data/items/consumables/torstol_potion_unf.yaml
@@ -6,7 +6,7 @@ value: 102
 stackable: false
 made_from:
   - items: [torstol]
-    qty: 1
+    quantity: 1
   - items: [vial_of_water]
-    qty: 1
+    quantity: 1
 ticks: 0
diff --git a/data/items/trout.yaml b/data/items/consumables/trout.yaml
index df6cdcc..df6cdcc 100644
--- a/data/items/trout.yaml
+++ b/data/items/consumables/trout.yaml
diff --git a/data/items/vial_of_water.yaml b/data/items/consumables/vial_of_water.yaml
index c3e2995..c3e2995 100644
--- a/data/items/vial_of_water.yaml
+++ b/data/items/consumables/vial_of_water.yaml
diff --git a/data/items/watermelon.yaml b/data/items/consumables/watermelon.yaml
index 3374687..3374687 100644
--- a/data/items/watermelon.yaml
+++ b/data/items/consumables/watermelon.yaml
diff --git a/data/items/advanced_bio_deck.yaml b/data/items/decks/advanced_bio_deck.yaml
index 1411a16..1411a16 100644
--- a/data/items/advanced_bio_deck.yaml
+++ b/data/items/decks/advanced_bio_deck.yaml
diff --git a/data/items/advanced_eco_deck.yaml b/data/items/decks/advanced_eco_deck.yaml
index c844f47..c844f47 100644
--- a/data/items/advanced_eco_deck.yaml
+++ b/data/items/decks/advanced_eco_deck.yaml
diff --git a/data/items/advanced_hydro_deck.yaml b/data/items/decks/advanced_hydro_deck.yaml
index 2910931..2910931 100644
--- a/data/items/advanced_hydro_deck.yaml
+++ b/data/items/decks/advanced_hydro_deck.yaml
diff --git a/data/items/advanced_solar_deck.yaml b/data/items/decks/advanced_solar_deck.yaml
index 002845c..002845c 100644
--- a/data/items/advanced_solar_deck.yaml
+++ b/data/items/decks/advanced_solar_deck.yaml
diff --git a/data/items/basic_deck.yaml b/data/items/decks/basic_deck.yaml
index ef2549a..ef2549a 100644
--- a/data/items/basic_deck.yaml
+++ b/data/items/decks/basic_deck.yaml
diff --git a/data/items/bio_deck.yaml b/data/items/decks/bio_deck.yaml
index 8de2036..8de2036 100644
--- a/data/items/bio_deck.yaml
+++ b/data/items/decks/bio_deck.yaml
diff --git a/data/items/bio_identifier.yaml b/data/items/decks/bio_identifier.yaml
index 1b5a941..1b5a941 100644
--- a/data/items/bio_identifier.yaml
+++ b/data/items/decks/bio_identifier.yaml
diff --git a/data/items/biojunk.yaml b/data/items/decks/biojunk.yaml
index 8832a20..8832a20 100644
--- a/data/items/biojunk.yaml
+++ b/data/items/decks/biojunk.yaml
diff --git a/data/items/blood_identifier.yaml b/data/items/decks/blood_identifier.yaml
index 3540179..3540179 100644
--- a/data/items/blood_identifier.yaml
+++ b/data/items/decks/blood_identifier.yaml
diff --git a/data/items/bloodjunk.yaml b/data/items/decks/bloodjunk.yaml
index b837137..b837137 100644
--- a/data/items/bloodjunk.yaml
+++ b/data/items/decks/bloodjunk.yaml
diff --git a/data/items/chaos_identifier.yaml b/data/items/decks/chaos_identifier.yaml
index 82a7ccf..82a7ccf 100644
--- a/data/items/chaos_identifier.yaml
+++ b/data/items/decks/chaos_identifier.yaml
diff --git a/data/items/chaosjunk.yaml b/data/items/decks/chaosjunk.yaml
index 99515df..99515df 100644
--- a/data/items/chaosjunk.yaml
+++ b/data/items/decks/chaosjunk.yaml
diff --git a/data/items/cosmic_identifier.yaml b/data/items/decks/cosmic_identifier.yaml
index 97cb89a..97cb89a 100644
--- a/data/items/cosmic_identifier.yaml
+++ b/data/items/decks/cosmic_identifier.yaml
diff --git a/data/items/cosmicjunk.yaml b/data/items/decks/cosmicjunk.yaml
index d9acc21..d9acc21 100644
--- a/data/items/cosmicjunk.yaml
+++ b/data/items/decks/cosmicjunk.yaml
diff --git a/data/items/death_identifier.yaml b/data/items/decks/death_identifier.yaml
index 778bca5..778bca5 100644
--- a/data/items/death_identifier.yaml
+++ b/data/items/decks/death_identifier.yaml
diff --git a/data/items/deathjunk.yaml b/data/items/decks/deathjunk.yaml
index 7dcaba8..7dcaba8 100644
--- a/data/items/deathjunk.yaml
+++ b/data/items/decks/deathjunk.yaml
diff --git a/data/items/eco_deck.yaml b/data/items/decks/eco_deck.yaml
index ef1a991..ef1a991 100644
--- a/data/items/eco_deck.yaml
+++ b/data/items/decks/eco_deck.yaml
diff --git a/data/items/eco_identifier.yaml b/data/items/decks/eco_identifier.yaml
index d0af516..d0af516 100644
--- a/data/items/eco_identifier.yaml
+++ b/data/items/decks/eco_identifier.yaml
diff --git a/data/items/ecojunk.yaml b/data/items/decks/ecojunk.yaml
index c050049..c050049 100644
--- a/data/items/ecojunk.yaml
+++ b/data/items/decks/ecojunk.yaml
diff --git a/data/items/hydro_deck.yaml b/data/items/decks/hydro_deck.yaml
index 0e417a2..0e417a2 100644
--- a/data/items/hydro_deck.yaml
+++ b/data/items/decks/hydro_deck.yaml
diff --git a/data/items/hydro_identifier.yaml b/data/items/decks/hydro_identifier.yaml
index 3eb7d98..3eb7d98 100644
--- a/data/items/hydro_identifier.yaml
+++ b/data/items/decks/hydro_identifier.yaml
diff --git a/data/items/hydrojunk.yaml b/data/items/decks/hydrojunk.yaml
index bfcd64a..bfcd64a 100644
--- a/data/items/hydrojunk.yaml
+++ b/data/items/decks/hydrojunk.yaml
diff --git a/data/items/law_identifier.yaml b/data/items/decks/law_identifier.yaml
index 25700e1..25700e1 100644
--- a/data/items/law_identifier.yaml
+++ b/data/items/decks/law_identifier.yaml
diff --git a/data/items/lawjunk.yaml b/data/items/decks/lawjunk.yaml
index b46bf9e..b46bf9e 100644
--- a/data/items/lawjunk.yaml
+++ b/data/items/decks/lawjunk.yaml
diff --git a/data/items/nature_identifier.yaml b/data/items/decks/nature_identifier.yaml
index dc441cf..dc441cf 100644
--- a/data/items/nature_identifier.yaml
+++ b/data/items/decks/nature_identifier.yaml
diff --git a/data/items/naturejunk.yaml b/data/items/decks/naturejunk.yaml
index 49ed1ff..49ed1ff 100644
--- a/data/items/naturejunk.yaml
+++ b/data/items/decks/naturejunk.yaml
diff --git a/data/items/solar_deck.yaml b/data/items/decks/solar_deck.yaml
index 72b7e9e..72b7e9e 100644
--- a/data/items/solar_deck.yaml
+++ b/data/items/decks/solar_deck.yaml
diff --git a/data/items/solar_identifier.yaml b/data/items/decks/solar_identifier.yaml
index 663bd9f..663bd9f 100644
--- a/data/items/solar_identifier.yaml
+++ b/data/items/decks/solar_identifier.yaml
diff --git a/data/items/solarjunk.yaml b/data/items/decks/solarjunk.yaml
index ab4d5d5..ab4d5d5 100644
--- a/data/items/solarjunk.yaml
+++ b/data/items/decks/solarjunk.yaml
diff --git a/data/items/abyssal_bracelet.yaml b/data/items/equipment/abyssal_bracelet.yaml
index 3b424c3..3b424c3 100644
--- a/data/items/abyssal_bracelet.yaml
+++ b/data/items/equipment/abyssal_bracelet.yaml
diff --git a/data/items/adamant_dagger.yaml b/data/items/equipment/adamant_dagger.yaml
index d78ecdc..d78ecdc 100644
--- a/data/items/adamant_dagger.yaml
+++ b/data/items/equipment/adamant_dagger.yaml
diff --git a/data/items/adamant_full_helm.yaml b/data/items/equipment/adamant_full_helm.yaml
index 3c36c62..3c36c62 100644
--- a/data/items/adamant_full_helm.yaml
+++ b/data/items/equipment/adamant_full_helm.yaml
diff --git a/data/items/adamant_med_helm.yaml b/data/items/equipment/adamant_med_helm.yaml
index 1fb6785..1fb6785 100644
--- a/data/items/adamant_med_helm.yaml
+++ b/data/items/equipment/adamant_med_helm.yaml
diff --git a/data/items/adamant_platebody.yaml b/data/items/equipment/adamant_platebody.yaml
index a37b781..a37b781 100644
--- a/data/items/adamant_platebody.yaml
+++ b/data/items/equipment/adamant_platebody.yaml
diff --git a/data/items/adamant_sword.yaml b/data/items/equipment/adamant_sword.yaml
index 035b615..035b615 100644
--- a/data/items/adamant_sword.yaml
+++ b/data/items/equipment/adamant_sword.yaml
diff --git a/data/items/binding_necklace.yaml b/data/items/equipment/binding_necklace.yaml
index e9e7559..e9e7559 100644
--- a/data/items/binding_necklace.yaml
+++ b/data/items/equipment/binding_necklace.yaml
diff --git a/data/items/black_axe.yaml b/data/items/equipment/black_axe.yaml
index e708645..e708645 100644
--- a/data/items/black_axe.yaml
+++ b/data/items/equipment/black_axe.yaml
diff --git a/data/items/bracelet_of_clay.yaml b/data/items/equipment/bracelet_of_clay.yaml
index d8cd881..d8cd881 100644
--- a/data/items/bracelet_of_clay.yaml
+++ b/data/items/equipment/bracelet_of_clay.yaml
diff --git a/data/items/bracelet_of_slaughter.yaml b/data/items/equipment/bracelet_of_slaughter.yaml
index 2bbbbec..2bbbbec 100644
--- a/data/items/bracelet_of_slaughter.yaml
+++ b/data/items/equipment/bracelet_of_slaughter.yaml
diff --git a/data/items/bronze_dagger.yaml b/data/items/equipment/bronze_dagger.yaml
index 95ec968..95ec968 100644
--- a/data/items/bronze_dagger.yaml
+++ b/data/items/equipment/bronze_dagger.yaml
diff --git a/data/items/bronze_full_helm.yaml b/data/items/equipment/bronze_full_helm.yaml
index ed006a8..ed006a8 100644
--- a/data/items/bronze_full_helm.yaml
+++ b/data/items/equipment/bronze_full_helm.yaml
diff --git a/data/items/bronze_med_helm.yaml b/data/items/equipment/bronze_med_helm.yaml
index c9635cf..c9635cf 100644
--- a/data/items/bronze_med_helm.yaml
+++ b/data/items/equipment/bronze_med_helm.yaml
diff --git a/data/items/bronze_platebody.yaml b/data/items/equipment/bronze_platebody.yaml
index 8e6dd2c..8e6dd2c 100644
--- a/data/items/bronze_platebody.yaml
+++ b/data/items/equipment/bronze_platebody.yaml
diff --git a/data/items/bronze_sword.yaml b/data/items/equipment/bronze_sword.yaml
index 0cfdd0e..0cfdd0e 100644
--- a/data/items/bronze_sword.yaml
+++ b/data/items/equipment/bronze_sword.yaml
diff --git a/data/items/capacitor_gloves.yaml b/data/items/equipment/capacitor_gloves.yaml
index e5af9ed..e5af9ed 100644
--- a/data/items/capacitor_gloves.yaml
+++ b/data/items/equipment/capacitor_gloves.yaml
diff --git a/data/items/cape_of_agility.yaml b/data/items/equipment/cape_of_agility.yaml
index 5567e73..5567e73 100644
--- a/data/items/cape_of_agility.yaml
+++ b/data/items/equipment/cape_of_agility.yaml
diff --git a/data/items/chitin_plate.yaml b/data/items/equipment/chitin_plate.yaml
index 4148a2a..4148a2a 100644
--- a/data/items/chitin_plate.yaml
+++ b/data/items/equipment/chitin_plate.yaml
diff --git a/data/items/coif.yaml b/data/items/equipment/coif.yaml
index 8d910d7..8d910d7 100644
--- a/data/items/coif.yaml
+++ b/data/items/equipment/coif.yaml
diff --git a/data/items/diamond_amulet_u.yaml b/data/items/equipment/diamond_amulet_u.yaml
index 55eaf45..55eaf45 100644
--- a/data/items/diamond_amulet_u.yaml
+++ b/data/items/equipment/diamond_amulet_u.yaml
diff --git a/data/items/diamond_bracelet.yaml b/data/items/equipment/diamond_bracelet.yaml
index 5ba5778..5ba5778 100644
--- a/data/items/diamond_bracelet.yaml
+++ b/data/items/equipment/diamond_bracelet.yaml
diff --git a/data/items/diamond_necklace.yaml b/data/items/equipment/diamond_necklace.yaml
index 5629b8c..5629b8c 100644
--- a/data/items/diamond_necklace.yaml
+++ b/data/items/equipment/diamond_necklace.yaml
diff --git a/data/items/diamond_ring.yaml b/data/items/equipment/diamond_ring.yaml
index 54023c3..54023c3 100644
--- a/data/items/diamond_ring.yaml
+++ b/data/items/equipment/diamond_ring.yaml
diff --git a/data/items/digsite_pendant.yaml b/data/items/equipment/digsite_pendant.yaml
index b28e3e3..b28e3e3 100644
--- a/data/items/digsite_pendant.yaml
+++ b/data/items/equipment/digsite_pendant.yaml
diff --git a/data/items/dragon_axe.yaml b/data/items/equipment/dragon_axe.yaml
index ddc9758..ddc9758 100644
--- a/data/items/dragon_axe.yaml
+++ b/data/items/equipment/dragon_axe.yaml
diff --git a/data/items/emerald_amulet_u.yaml b/data/items/equipment/emerald_amulet_u.yaml
index 87261d4..87261d4 100644
--- a/data/items/emerald_amulet_u.yaml
+++ b/data/items/equipment/emerald_amulet_u.yaml
diff --git a/data/items/emerald_bracelet.yaml b/data/items/equipment/emerald_bracelet.yaml
index 04e4979..04e4979 100644
--- a/data/items/emerald_bracelet.yaml
+++ b/data/items/equipment/emerald_bracelet.yaml
diff --git a/data/items/emerald_necklace.yaml b/data/items/equipment/emerald_necklace.yaml
index 2107ca4..2107ca4 100644
--- a/data/items/emerald_necklace.yaml
+++ b/data/items/equipment/emerald_necklace.yaml
diff --git a/data/items/emerald_ring.yaml b/data/items/equipment/emerald_ring.yaml
index 253f872..253f872 100644
--- a/data/items/emerald_ring.yaml
+++ b/data/items/equipment/emerald_ring.yaml
diff --git a/data/items/gold_amulet_u.yaml b/data/items/equipment/gold_amulet_u.yaml
index 8671941..8671941 100644
--- a/data/items/gold_amulet_u.yaml
+++ b/data/items/equipment/gold_amulet_u.yaml
diff --git a/data/items/gold_bracelet.yaml b/data/items/equipment/gold_bracelet.yaml
index 2c4534f..2c4534f 100644
--- a/data/items/gold_bracelet.yaml
+++ b/data/items/equipment/gold_bracelet.yaml
diff --git a/data/items/gold_necklace.yaml b/data/items/equipment/gold_necklace.yaml
index 4a22ac1..4a22ac1 100644
--- a/data/items/gold_necklace.yaml
+++ b/data/items/equipment/gold_necklace.yaml
diff --git a/data/items/gold_ring.yaml b/data/items/equipment/gold_ring.yaml
index 1a39165..1a39165 100644
--- a/data/items/gold_ring.yaml
+++ b/data/items/equipment/gold_ring.yaml
diff --git a/data/items/graceful_boots.yaml b/data/items/equipment/graceful_boots.yaml
index 71e8f84..71e8f84 100644
--- a/data/items/graceful_boots.yaml
+++ b/data/items/equipment/graceful_boots.yaml
diff --git a/data/items/graceful_cape.yaml b/data/items/equipment/graceful_cape.yaml
index 1d7c8f0..1d7c8f0 100644
--- a/data/items/graceful_cape.yaml
+++ b/data/items/equipment/graceful_cape.yaml
diff --git a/data/items/graceful_gloves.yaml b/data/items/equipment/graceful_gloves.yaml
index 311ded5..311ded5 100644
--- a/data/items/graceful_gloves.yaml
+++ b/data/items/equipment/graceful_gloves.yaml
diff --git a/data/items/graceful_hat.yaml b/data/items/equipment/graceful_hat.yaml
index faec1e3..faec1e3 100644
--- a/data/items/graceful_hat.yaml
+++ b/data/items/equipment/graceful_hat.yaml
diff --git a/data/items/graceful_legs.yaml b/data/items/equipment/graceful_legs.yaml
index 31eeebf..31eeebf 100644
--- a/data/items/graceful_legs.yaml
+++ b/data/items/equipment/graceful_legs.yaml
diff --git a/data/items/graceful_torso.yaml b/data/items/equipment/graceful_torso.yaml
index ec1edb7..ec1edb7 100644
--- a/data/items/graceful_torso.yaml
+++ b/data/items/equipment/graceful_torso.yaml
diff --git a/data/items/hard_leather_body.yaml b/data/items/equipment/hard_leather_body.yaml
index a5fe30f..a5fe30f 100644
--- a/data/items/hard_leather_body.yaml
+++ b/data/items/equipment/hard_leather_body.yaml
diff --git a/data/items/hard_leather_shield.yaml b/data/items/equipment/hard_leather_shield.yaml
index fd7dabf..fd7dabf 100644
--- a/data/items/hard_leather_shield.yaml
+++ b/data/items/equipment/hard_leather_shield.yaml
diff --git a/data/items/inoculation_bracelet.yaml b/data/items/equipment/inoculation_bracelet.yaml
index 9a3a149..9a3a149 100644
--- a/data/items/inoculation_bracelet.yaml
+++ b/data/items/equipment/inoculation_bracelet.yaml
diff --git a/data/items/insulated_gloves.yaml b/data/items/equipment/insulated_gloves.yaml
index 3e53614..3e53614 100644
--- a/data/items/insulated_gloves.yaml
+++ b/data/items/equipment/insulated_gloves.yaml
diff --git a/data/items/iron_dagger.yaml b/data/items/equipment/iron_dagger.yaml
index 8fa645c..8fa645c 100644
--- a/data/items/iron_dagger.yaml
+++ b/data/items/equipment/iron_dagger.yaml
diff --git a/data/items/iron_full_helm.yaml b/data/items/equipment/iron_full_helm.yaml
index 3a2fc0c..3a2fc0c 100644
--- a/data/items/iron_full_helm.yaml
+++ b/data/items/equipment/iron_full_helm.yaml
diff --git a/data/items/iron_med_helm.yaml b/data/items/equipment/iron_med_helm.yaml
index 6956283..6956283 100644
--- a/data/items/iron_med_helm.yaml
+++ b/data/items/equipment/iron_med_helm.yaml
diff --git a/data/items/iron_platebody.yaml b/data/items/equipment/iron_platebody.yaml
index 3c0be80..3c0be80 100644
--- a/data/items/iron_platebody.yaml
+++ b/data/items/equipment/iron_platebody.yaml
diff --git a/data/items/iron_sword.yaml b/data/items/equipment/iron_sword.yaml
index a5711fc..a5711fc 100644
--- a/data/items/iron_sword.yaml
+++ b/data/items/equipment/iron_sword.yaml
diff --git a/data/items/leather_body.yaml b/data/items/equipment/leather_body.yaml
index e69342c..e69342c 100644
--- a/data/items/leather_body.yaml
+++ b/data/items/equipment/leather_body.yaml
diff --git a/data/items/leather_boots.yaml b/data/items/equipment/leather_boots.yaml
index 7716e95..7716e95 100644
--- a/data/items/leather_boots.yaml
+++ b/data/items/equipment/leather_boots.yaml
diff --git a/data/items/leather_chaps.yaml b/data/items/equipment/leather_chaps.yaml
index 1a17c16..1a17c16 100644
--- a/data/items/leather_chaps.yaml
+++ b/data/items/equipment/leather_chaps.yaml
diff --git a/data/items/leather_cowl.yaml b/data/items/equipment/leather_cowl.yaml
index aa5965a..aa5965a 100644
--- a/data/items/leather_cowl.yaml
+++ b/data/items/equipment/leather_cowl.yaml
diff --git a/data/items/leather_gloves.yaml b/data/items/equipment/leather_gloves.yaml
index 7590fee..7590fee 100644
--- a/data/items/leather_gloves.yaml
+++ b/data/items/equipment/leather_gloves.yaml
diff --git a/data/items/leather_vambraces.yaml b/data/items/equipment/leather_vambraces.yaml
index fa59aa9..fa59aa9 100644
--- a/data/items/leather_vambraces.yaml
+++ b/data/items/equipment/leather_vambraces.yaml
diff --git a/data/items/longbow.yaml b/data/items/equipment/longbow.yaml
index f40c96d..f40c96d 100644
--- a/data/items/longbow.yaml
+++ b/data/items/equipment/longbow.yaml
diff --git a/data/items/longbow_u.yaml b/data/items/equipment/longbow_u.yaml
index 93e5ff0..93e5ff0 100644
--- a/data/items/longbow_u.yaml
+++ b/data/items/equipment/longbow_u.yaml
diff --git a/data/items/magic_longbow.yaml b/data/items/equipment/magic_longbow.yaml
index 07797fb..07797fb 100644
--- a/data/items/magic_longbow.yaml
+++ b/data/items/equipment/magic_longbow.yaml
diff --git a/data/items/magic_longbow_u.yaml b/data/items/equipment/magic_longbow_u.yaml
index 65682ed..65682ed 100644
--- a/data/items/magic_longbow_u.yaml
+++ b/data/items/equipment/magic_longbow_u.yaml
diff --git a/data/items/magic_shortbow.yaml b/data/items/equipment/magic_shortbow.yaml
index 893b287..893b287 100644
--- a/data/items/magic_shortbow.yaml
+++ b/data/items/equipment/magic_shortbow.yaml
diff --git a/data/items/magic_shortbow_u.yaml b/data/items/equipment/magic_shortbow_u.yaml
index 2075bd1..2075bd1 100644
--- a/data/items/magic_shortbow_u.yaml
+++ b/data/items/equipment/magic_shortbow_u.yaml
diff --git a/data/items/maple_longbow.yaml b/data/items/equipment/maple_longbow.yaml
index 1c86128..1c86128 100644
--- a/data/items/maple_longbow.yaml
+++ b/data/items/equipment/maple_longbow.yaml
diff --git a/data/items/maple_longbow_u.yaml b/data/items/equipment/maple_longbow_u.yaml
index 120bf1d..120bf1d 100644
--- a/data/items/maple_longbow_u.yaml
+++ b/data/items/equipment/maple_longbow_u.yaml
diff --git a/data/items/maple_shortbow.yaml b/data/items/equipment/maple_shortbow.yaml
index 38c27b5..38c27b5 100644
--- a/data/items/maple_shortbow.yaml
+++ b/data/items/equipment/maple_shortbow.yaml
diff --git a/data/items/maple_shortbow_u.yaml b/data/items/equipment/maple_shortbow_u.yaml
index 6fc6b84..6fc6b84 100644
--- a/data/items/maple_shortbow_u.yaml
+++ b/data/items/equipment/maple_shortbow_u.yaml
diff --git a/data/items/mithril_dagger.yaml b/data/items/equipment/mithril_dagger.yaml
index 8ffe595..8ffe595 100644
--- a/data/items/mithril_dagger.yaml
+++ b/data/items/equipment/mithril_dagger.yaml
diff --git a/data/items/mithril_full_helm.yaml b/data/items/equipment/mithril_full_helm.yaml
index d317705..d317705 100644
--- a/data/items/mithril_full_helm.yaml
+++ b/data/items/equipment/mithril_full_helm.yaml
diff --git a/data/items/mithril_med_helm.yaml b/data/items/equipment/mithril_med_helm.yaml
index f244a7c..f244a7c 100644
--- a/data/items/mithril_med_helm.yaml
+++ b/data/items/equipment/mithril_med_helm.yaml
diff --git a/data/items/mithril_platebody.yaml b/data/items/equipment/mithril_platebody.yaml
index 50e8ea0..50e8ea0 100644
--- a/data/items/mithril_platebody.yaml
+++ b/data/items/equipment/mithril_platebody.yaml
diff --git a/data/items/mithril_sword.yaml b/data/items/equipment/mithril_sword.yaml
index 1824f5b..1824f5b 100644
--- a/data/items/mithril_sword.yaml
+++ b/data/items/equipment/mithril_sword.yaml
diff --git a/data/items/necklace_of_passage.yaml b/data/items/equipment/necklace_of_passage.yaml
index b5630ed..b5630ed 100644
--- a/data/items/necklace_of_passage.yaml
+++ b/data/items/equipment/necklace_of_passage.yaml
diff --git a/data/items/neural_headband.yaml b/data/items/equipment/neural_headband.yaml
index e01e57d..e01e57d 100644
--- a/data/items/neural_headband.yaml
+++ b/data/items/equipment/neural_headband.yaml
diff --git a/data/items/oak_longbow.yaml b/data/items/equipment/oak_longbow.yaml
index 71e7c7c..71e7c7c 100644
--- a/data/items/oak_longbow.yaml
+++ b/data/items/equipment/oak_longbow.yaml
diff --git a/data/items/oak_longbow_u.yaml b/data/items/equipment/oak_longbow_u.yaml
index 6df0dab..6df0dab 100644
--- a/data/items/oak_longbow_u.yaml
+++ b/data/items/equipment/oak_longbow_u.yaml
diff --git a/data/items/oak_shortbow.yaml b/data/items/equipment/oak_shortbow.yaml
index 30ebbce..30ebbce 100644
--- a/data/items/oak_shortbow.yaml
+++ b/data/items/equipment/oak_shortbow.yaml
diff --git a/data/items/oak_shortbow_u.yaml b/data/items/equipment/oak_shortbow_u.yaml
index 5bebc38..5bebc38 100644
--- a/data/items/oak_shortbow_u.yaml
+++ b/data/items/equipment/oak_shortbow_u.yaml
diff --git a/data/items/party_hat_blue.yaml b/data/items/equipment/party_hat_blue.yaml
index 42d6bb5..42d6bb5 100644
--- a/data/items/party_hat_blue.yaml
+++ b/data/items/equipment/party_hat_blue.yaml
diff --git a/data/items/party_hat_green.yaml b/data/items/equipment/party_hat_green.yaml
index 82c3bc7..82c3bc7 100644
--- a/data/items/party_hat_green.yaml
+++ b/data/items/equipment/party_hat_green.yaml
diff --git a/data/items/party_hat_pink.yaml b/data/items/equipment/party_hat_pink.yaml
index 006e261..006e261 100644
--- a/data/items/party_hat_pink.yaml
+++ b/data/items/equipment/party_hat_pink.yaml
diff --git a/data/items/party_hat_red.yaml b/data/items/equipment/party_hat_red.yaml
index 005b3dd..005b3dd 100644
--- a/data/items/party_hat_red.yaml
+++ b/data/items/equipment/party_hat_red.yaml
diff --git a/data/items/party_hat_white.yaml b/data/items/equipment/party_hat_white.yaml
index c8e8f86..c8e8f86 100644
--- a/data/items/party_hat_white.yaml
+++ b/data/items/equipment/party_hat_white.yaml
diff --git a/data/items/party_hat_yellow.yaml b/data/items/equipment/party_hat_yellow.yaml
index 33a85f8..33a85f8 100644
--- a/data/items/party_hat_yellow.yaml
+++ b/data/items/equipment/party_hat_yellow.yaml
diff --git a/data/items/phoenix_necklace.yaml b/data/items/equipment/phoenix_necklace.yaml
index b53fafb..b53fafb 100644
--- a/data/items/phoenix_necklace.yaml
+++ b/data/items/equipment/phoenix_necklace.yaml
diff --git a/data/items/power_amulet.yaml b/data/items/equipment/power_amulet.yaml
index bd136a4..bd136a4 100644
--- a/data/items/power_amulet.yaml
+++ b/data/items/equipment/power_amulet.yaml
diff --git a/data/items/ring_of_dueling.yaml b/data/items/equipment/ring_of_dueling.yaml
index 0c11e87..0c11e87 100644
--- a/data/items/ring_of_dueling.yaml
+++ b/data/items/equipment/ring_of_dueling.yaml
diff --git a/data/items/ring_of_forging.yaml b/data/items/equipment/ring_of_forging.yaml
index d0792a1..d0792a1 100644
--- a/data/items/ring_of_forging.yaml
+++ b/data/items/equipment/ring_of_forging.yaml
diff --git a/data/items/ring_of_life.yaml b/data/items/equipment/ring_of_life.yaml
index ab0b6e3..ab0b6e3 100644
--- a/data/items/ring_of_life.yaml
+++ b/data/items/equipment/ring_of_life.yaml
diff --git a/data/items/ring_of_recoil.yaml b/data/items/equipment/ring_of_recoil.yaml
index c143f68..c143f68 100644
--- a/data/items/ring_of_recoil.yaml
+++ b/data/items/equipment/ring_of_recoil.yaml
diff --git a/data/items/ruby_amulet_u.yaml b/data/items/equipment/ruby_amulet_u.yaml
index 031bf8b..031bf8b 100644
--- a/data/items/ruby_amulet_u.yaml
+++ b/data/items/equipment/ruby_amulet_u.yaml
diff --git a/data/items/ruby_bracelet.yaml b/data/items/equipment/ruby_bracelet.yaml
index e5f3f70..e5f3f70 100644
--- a/data/items/ruby_bracelet.yaml
+++ b/data/items/equipment/ruby_bracelet.yaml
diff --git a/data/items/ruby_necklace.yaml b/data/items/equipment/ruby_necklace.yaml
index e181777..e181777 100644
--- a/data/items/ruby_necklace.yaml
+++ b/data/items/equipment/ruby_necklace.yaml
diff --git a/data/items/ruby_ring.yaml b/data/items/equipment/ruby_ring.yaml
index cb0cfde..cb0cfde 100644
--- a/data/items/ruby_ring.yaml
+++ b/data/items/equipment/ruby_ring.yaml
diff --git a/data/items/rune_dagger.yaml b/data/items/equipment/rune_dagger.yaml
index 9e8507b..9e8507b 100644
--- a/data/items/rune_dagger.yaml
+++ b/data/items/equipment/rune_dagger.yaml
diff --git a/data/items/rune_full_helm.yaml b/data/items/equipment/rune_full_helm.yaml
index 87d6973..87d6973 100644
--- a/data/items/rune_full_helm.yaml
+++ b/data/items/equipment/rune_full_helm.yaml
diff --git a/data/items/rune_med_helm.yaml b/data/items/equipment/rune_med_helm.yaml
index 895d257..895d257 100644
--- a/data/items/rune_med_helm.yaml
+++ b/data/items/equipment/rune_med_helm.yaml
diff --git a/data/items/rune_platebody.yaml b/data/items/equipment/rune_platebody.yaml
index d1e5fb1..d1e5fb1 100644
--- a/data/items/rune_platebody.yaml
+++ b/data/items/equipment/rune_platebody.yaml
diff --git a/data/items/rune_sword.yaml b/data/items/equipment/rune_sword.yaml
index e0bfb74..e0bfb74 100644
--- a/data/items/rune_sword.yaml
+++ b/data/items/equipment/rune_sword.yaml
diff --git a/data/items/sapphire_amulet_u.yaml b/data/items/equipment/sapphire_amulet_u.yaml
index 22ef39c..22ef39c 100644
--- a/data/items/sapphire_amulet_u.yaml
+++ b/data/items/equipment/sapphire_amulet_u.yaml
diff --git a/data/items/sapphire_bracelet.yaml b/data/items/equipment/sapphire_bracelet.yaml
index a2996eb..a2996eb 100644
--- a/data/items/sapphire_bracelet.yaml
+++ b/data/items/equipment/sapphire_bracelet.yaml
diff --git a/data/items/sapphire_necklace.yaml b/data/items/equipment/sapphire_necklace.yaml
index e553973..e553973 100644
--- a/data/items/sapphire_necklace.yaml
+++ b/data/items/equipment/sapphire_necklace.yaml
diff --git a/data/items/sapphire_ring.yaml b/data/items/equipment/sapphire_ring.yaml
index 40e8cc5..40e8cc5 100644
--- a/data/items/sapphire_ring.yaml
+++ b/data/items/equipment/sapphire_ring.yaml
diff --git a/data/items/shortbow.yaml b/data/items/equipment/shortbow.yaml
index ecd3630..ecd3630 100644
--- a/data/items/shortbow.yaml
+++ b/data/items/equipment/shortbow.yaml
diff --git a/data/items/shortbow_u.yaml b/data/items/equipment/shortbow_u.yaml
index 6ffcafc..6ffcafc 100644
--- a/data/items/shortbow_u.yaml
+++ b/data/items/equipment/shortbow_u.yaml
diff --git a/data/items/spectral_visor.yaml b/data/items/equipment/spectral_visor.yaml
index 851a929..851a929 100644
--- a/data/items/spectral_visor.yaml
+++ b/data/items/equipment/spectral_visor.yaml
diff --git a/data/items/steel_dagger.yaml b/data/items/equipment/steel_dagger.yaml
index e52b882..e52b882 100644
--- a/data/items/steel_dagger.yaml
+++ b/data/items/equipment/steel_dagger.yaml
diff --git a/data/items/steel_full_helm.yaml b/data/items/equipment/steel_full_helm.yaml
index 7152ded..7152ded 100644
--- a/data/items/steel_full_helm.yaml
+++ b/data/items/equipment/steel_full_helm.yaml
diff --git a/data/items/steel_med_helm.yaml b/data/items/equipment/steel_med_helm.yaml
index 9e15fdd..9e15fdd 100644
--- a/data/items/steel_med_helm.yaml
+++ b/data/items/equipment/steel_med_helm.yaml
diff --git a/data/items/steel_platebody.yaml b/data/items/equipment/steel_platebody.yaml
index f44dfa3..f44dfa3 100644
--- a/data/items/steel_platebody.yaml
+++ b/data/items/equipment/steel_platebody.yaml
diff --git a/data/items/steel_sword.yaml b/data/items/equipment/steel_sword.yaml
index e096dc9..e096dc9 100644
--- a/data/items/steel_sword.yaml
+++ b/data/items/equipment/steel_sword.yaml
diff --git a/data/items/willow_longbow.yaml b/data/items/equipment/willow_longbow.yaml
index e30528c..e30528c 100644
--- a/data/items/willow_longbow.yaml
+++ b/data/items/equipment/willow_longbow.yaml
diff --git a/data/items/willow_longbow_u.yaml b/data/items/equipment/willow_longbow_u.yaml
index 5e4e9da..5e4e9da 100644
--- a/data/items/willow_longbow_u.yaml
+++ b/data/items/equipment/willow_longbow_u.yaml
diff --git a/data/items/willow_shortbow.yaml b/data/items/equipment/willow_shortbow.yaml
index f75cfe9..f75cfe9 100644
--- a/data/items/willow_shortbow.yaml
+++ b/data/items/equipment/willow_shortbow.yaml
diff --git a/data/items/willow_shortbow_u.yaml b/data/items/equipment/willow_shortbow_u.yaml
index b467455..b467455 100644
--- a/data/items/willow_shortbow_u.yaml
+++ b/data/items/equipment/willow_shortbow_u.yaml
diff --git a/data/items/yew_longbow.yaml b/data/items/equipment/yew_longbow.yaml
index 1e7c0f5..1e7c0f5 100644
--- a/data/items/yew_longbow.yaml
+++ b/data/items/equipment/yew_longbow.yaml
diff --git a/data/items/yew_longbow_u.yaml b/data/items/equipment/yew_longbow_u.yaml
index ac4fdb2..ac4fdb2 100644
--- a/data/items/yew_longbow_u.yaml
+++ b/data/items/equipment/yew_longbow_u.yaml
diff --git a/data/items/yew_shortbow.yaml b/data/items/equipment/yew_shortbow.yaml
index c302a38..c302a38 100644
--- a/data/items/yew_shortbow.yaml
+++ b/data/items/equipment/yew_shortbow.yaml
diff --git a/data/items/yew_shortbow_u.yaml b/data/items/equipment/yew_shortbow_u.yaml
index 4c2124b..4c2124b 100644
--- a/data/items/yew_shortbow_u.yaml
+++ b/data/items/equipment/yew_shortbow_u.yaml
diff --git a/data/items/adamant_nails.yaml b/data/items/materials/adamant_nails.yaml
index c40d228..c40d228 100644
--- a/data/items/adamant_nails.yaml
+++ b/data/items/materials/adamant_nails.yaml
diff --git a/data/items/adamantite_bar.yaml b/data/items/materials/adamantite_bar.yaml
index 5a9b827..5a9b827 100644
--- a/data/items/adamantite_bar.yaml
+++ b/data/items/materials/adamantite_bar.yaml
diff --git a/data/items/adamantite_ore.yaml b/data/items/materials/adamantite_ore.yaml
index fabe0da..fabe0da 100644
--- a/data/items/adamantite_ore.yaml
+++ b/data/items/materials/adamantite_ore.yaml
diff --git a/data/items/arachnid_enzyme.yaml b/data/items/materials/arachnid_enzyme.yaml
index 4be2f65..4be2f65 100644
--- a/data/items/arachnid_enzyme.yaml
+++ b/data/items/materials/arachnid_enzyme.yaml
diff --git a/data/items/ashes.yaml b/data/items/materials/ashes.yaml
index 0b83f77..0b83f77 100644
--- a/data/items/ashes.yaml
+++ b/data/items/materials/ashes.yaml
diff --git a/data/items/avantoe.yaml b/data/items/materials/avantoe.yaml
index d596096..d596096 100644
--- a/data/items/avantoe.yaml
+++ b/data/items/materials/avantoe.yaml
diff --git a/data/items/ball_of_wool.yaml b/data/items/materials/ball_of_wool.yaml
index 1a680a4..1a680a4 100644
--- a/data/items/ball_of_wool.yaml
+++ b/data/items/materials/ball_of_wool.yaml
diff --git a/data/items/bones.yaml b/data/items/materials/bones.yaml
index 25097d3..25097d3 100644
--- a/data/items/bones.yaml
+++ b/data/items/materials/bones.yaml
diff --git a/data/items/bowstring.yaml b/data/items/materials/bowstring.yaml
index a180081..a180081 100644
--- a/data/items/bowstring.yaml
+++ b/data/items/materials/bowstring.yaml
diff --git a/data/items/bronze_bar.yaml b/data/items/materials/bronze_bar.yaml
index 053cfe8..053cfe8 100644
--- a/data/items/bronze_bar.yaml
+++ b/data/items/materials/bronze_bar.yaml
diff --git a/data/items/bronze_nails.yaml b/data/items/materials/bronze_nails.yaml
index 513e9c4..513e9c4 100644
--- a/data/items/bronze_nails.yaml
+++ b/data/items/materials/bronze_nails.yaml
diff --git a/data/items/cadantine.yaml b/data/items/materials/cadantine.yaml
index f684f0d..f684f0d 100644
--- a/data/items/cadantine.yaml
+++ b/data/items/materials/cadantine.yaml
diff --git a/data/items/chocolate_dust.yaml b/data/items/materials/chocolate_dust.yaml
index 56a6666..56a6666 100644
--- a/data/items/chocolate_dust.yaml
+++ b/data/items/materials/chocolate_dust.yaml
diff --git a/data/items/clay.yaml b/data/items/materials/clay.yaml
index 55c9b2b..55c9b2b 100644
--- a/data/items/clay.yaml
+++ b/data/items/materials/clay.yaml
diff --git a/data/items/coal.yaml b/data/items/materials/coal.yaml
index 7b79f08..7b79f08 100644
--- a/data/items/coal.yaml
+++ b/data/items/materials/coal.yaml
diff --git a/data/items/copper_ore.yaml b/data/items/materials/copper_ore.yaml
index 392879a..392879a 100644
--- a/data/items/copper_ore.yaml
+++ b/data/items/materials/copper_ore.yaml
diff --git a/data/items/cowhide.yaml b/data/items/materials/cowhide.yaml
index 2cb192e..2cb192e 100644
--- a/data/items/cowhide.yaml
+++ b/data/items/materials/cowhide.yaml
diff --git a/data/items/crushed_nest.yaml b/data/items/materials/crushed_nest.yaml
index 533d942..533d942 100644
--- a/data/items/crushed_nest.yaml
+++ b/data/items/materials/crushed_nest.yaml
diff --git a/data/items/diamond.yaml b/data/items/materials/diamond.yaml
index 2ec703f..2ec703f 100644
--- a/data/items/diamond.yaml
+++ b/data/items/materials/diamond.yaml
diff --git a/data/items/dwarf_weed.yaml b/data/items/materials/dwarf_weed.yaml
index 559edf3..559edf3 100644
--- a/data/items/dwarf_weed.yaml
+++ b/data/items/materials/dwarf_weed.yaml
diff --git a/data/items/ectoplasm.yaml b/data/items/materials/ectoplasm.yaml
index 8417e2d..8417e2d 100644
--- a/data/items/ectoplasm.yaml
+++ b/data/items/materials/ectoplasm.yaml
diff --git a/data/items/emerald.yaml b/data/items/materials/emerald.yaml
index 9a0c71d..9a0c71d 100644
--- a/data/items/emerald.yaml
+++ b/data/items/materials/emerald.yaml
diff --git a/data/items/eye_of_newt.yaml b/data/items/materials/eye_of_newt.yaml
index baf5ebe..baf5ebe 100644
--- a/data/items/eye_of_newt.yaml
+++ b/data/items/materials/eye_of_newt.yaml
diff --git a/data/items/feather.yaml b/data/items/materials/feather.yaml
index 25afc2a..25afc2a 100644
--- a/data/items/feather.yaml
+++ b/data/items/materials/feather.yaml
diff --git a/data/items/flax.yaml b/data/items/materials/flax.yaml
index 36f7082..36f7082 100644
--- a/data/items/flax.yaml
+++ b/data/items/materials/flax.yaml
diff --git a/data/items/gold_bar.yaml b/data/items/materials/gold_bar.yaml
index 3272b04..3272b04 100644
--- a/data/items/gold_bar.yaml
+++ b/data/items/materials/gold_bar.yaml
diff --git a/data/items/gold_ore.yaml b/data/items/materials/gold_ore.yaml
index e45ca03..e45ca03 100644
--- a/data/items/gold_ore.yaml
+++ b/data/items/materials/gold_ore.yaml
diff --git a/data/items/grimy_avantoe.yaml b/data/items/materials/grimy_avantoe.yaml
index 4f84679..4f84679 100644
--- a/data/items/grimy_avantoe.yaml
+++ b/data/items/materials/grimy_avantoe.yaml
diff --git a/data/items/grimy_cadantine.yaml b/data/items/materials/grimy_cadantine.yaml
index 0eb88f8..0eb88f8 100644
--- a/data/items/grimy_cadantine.yaml
+++ b/data/items/materials/grimy_cadantine.yaml
diff --git a/data/items/grimy_dwarf_weed.yaml b/data/items/materials/grimy_dwarf_weed.yaml
index 8f24595..8f24595 100644
--- a/data/items/grimy_dwarf_weed.yaml
+++ b/data/items/materials/grimy_dwarf_weed.yaml
diff --git a/data/items/grimy_guam.yaml b/data/items/materials/grimy_guam.yaml
index fb408af..fb408af 100644
--- a/data/items/grimy_guam.yaml
+++ b/data/items/materials/grimy_guam.yaml
diff --git a/data/items/grimy_harralander.yaml b/data/items/materials/grimy_harralander.yaml
index deea973..deea973 100644
--- a/data/items/grimy_harralander.yaml
+++ b/data/items/materials/grimy_harralander.yaml
diff --git a/data/items/grimy_irit.yaml b/data/items/materials/grimy_irit.yaml
index 54f66f8..54f66f8 100644
--- a/data/items/grimy_irit.yaml
+++ b/data/items/materials/grimy_irit.yaml
diff --git a/data/items/grimy_kwuarm.yaml b/data/items/materials/grimy_kwuarm.yaml
index 88630f8..88630f8 100644
--- a/data/items/grimy_kwuarm.yaml
+++ b/data/items/materials/grimy_kwuarm.yaml
diff --git a/data/items/grimy_lantadyme.yaml b/data/items/materials/grimy_lantadyme.yaml
index 8003931..8003931 100644
--- a/data/items/grimy_lantadyme.yaml
+++ b/data/items/materials/grimy_lantadyme.yaml
diff --git a/data/items/grimy_marrentill.yaml b/data/items/materials/grimy_marrentill.yaml
index 7548fe5..7548fe5 100644
--- a/data/items/grimy_marrentill.yaml
+++ b/data/items/materials/grimy_marrentill.yaml
diff --git a/data/items/grimy_ranarr.yaml b/data/items/materials/grimy_ranarr.yaml
index 1f82277..1f82277 100644
--- a/data/items/grimy_ranarr.yaml
+++ b/data/items/materials/grimy_ranarr.yaml
diff --git a/data/items/grimy_snapdragon.yaml b/data/items/materials/grimy_snapdragon.yaml
index f15c604..f15c604 100644
--- a/data/items/grimy_snapdragon.yaml
+++ b/data/items/materials/grimy_snapdragon.yaml
diff --git a/data/items/grimy_tarromin.yaml b/data/items/materials/grimy_tarromin.yaml
index 712061c..712061c 100644
--- a/data/items/grimy_tarromin.yaml
+++ b/data/items/materials/grimy_tarromin.yaml
diff --git a/data/items/grimy_toadflax.yaml b/data/items/materials/grimy_toadflax.yaml
index c489566..c489566 100644
--- a/data/items/grimy_toadflax.yaml
+++ b/data/items/materials/grimy_toadflax.yaml
diff --git a/data/items/grimy_torstol.yaml b/data/items/materials/grimy_torstol.yaml
index 47db8d7..47db8d7 100644
--- a/data/items/grimy_torstol.yaml
+++ b/data/items/materials/grimy_torstol.yaml
diff --git a/data/items/guam.yaml b/data/items/materials/guam.yaml
index 8fe7972..8fe7972 100644
--- a/data/items/guam.yaml
+++ b/data/items/materials/guam.yaml
diff --git a/data/items/hard_leather.yaml b/data/items/materials/hard_leather.yaml
index e04030c..e04030c 100644
--- a/data/items/hard_leather.yaml
+++ b/data/items/materials/hard_leather.yaml
diff --git a/data/items/harralander.yaml b/data/items/materials/harralander.yaml
index 08e66ed..08e66ed 100644
--- a/data/items/harralander.yaml
+++ b/data/items/materials/harralander.yaml
diff --git a/data/items/irit.yaml b/data/items/materials/irit.yaml
index 40f1956..40f1956 100644
--- a/data/items/irit.yaml
+++ b/data/items/materials/irit.yaml
diff --git a/data/items/iron_bar.yaml b/data/items/materials/iron_bar.yaml
index 26c8352..26c8352 100644
--- a/data/items/iron_bar.yaml
+++ b/data/items/materials/iron_bar.yaml
diff --git a/data/items/iron_nails.yaml b/data/items/materials/iron_nails.yaml
index 77323c9..77323c9 100644
--- a/data/items/iron_nails.yaml
+++ b/data/items/materials/iron_nails.yaml
diff --git a/data/items/iron_ore.yaml b/data/items/materials/iron_ore.yaml
index 78e82a5..78e82a5 100644
--- a/data/items/iron_ore.yaml
+++ b/data/items/materials/iron_ore.yaml
diff --git a/data/items/kwuarm.yaml b/data/items/materials/kwuarm.yaml
index ab0d7ff..ab0d7ff 100644
--- a/data/items/kwuarm.yaml
+++ b/data/items/materials/kwuarm.yaml
diff --git a/data/items/lantadyme.yaml b/data/items/materials/lantadyme.yaml
index d38b7da..d38b7da 100644
--- a/data/items/lantadyme.yaml
+++ b/data/items/materials/lantadyme.yaml
diff --git a/data/items/leather.yaml b/data/items/materials/leather.yaml
index 82d0696..82d0696 100644
--- a/data/items/leather.yaml
+++ b/data/items/materials/leather.yaml
diff --git a/data/items/limpwurt_root.yaml b/data/items/materials/limpwurt_root.yaml
index 49dd0dc..49dd0dc 100644
--- a/data/items/limpwurt_root.yaml
+++ b/data/items/materials/limpwurt_root.yaml
diff --git a/data/items/logs.yaml b/data/items/materials/logs.yaml
index 1395d94..1395d94 100644
--- a/data/items/logs.yaml
+++ b/data/items/materials/logs.yaml
diff --git a/data/items/magic_logs.yaml b/data/items/materials/magic_logs.yaml
index 01a804e..01a804e 100644
--- a/data/items/magic_logs.yaml
+++ b/data/items/materials/magic_logs.yaml
diff --git a/data/items/mahogany_logs.yaml b/data/items/materials/mahogany_logs.yaml
index 67b9a6c..67b9a6c 100644
--- a/data/items/mahogany_logs.yaml
+++ b/data/items/materials/mahogany_logs.yaml
diff --git a/data/items/mahogany_planks.yaml b/data/items/materials/mahogany_planks.yaml
index d551321..d551321 100644
--- a/data/items/mahogany_planks.yaml
+++ b/data/items/materials/mahogany_planks.yaml
diff --git a/data/items/maple_logs.yaml b/data/items/materials/maple_logs.yaml
index 6b081e1..6b081e1 100644
--- a/data/items/maple_logs.yaml
+++ b/data/items/materials/maple_logs.yaml
diff --git a/data/items/marrentill.yaml b/data/items/materials/marrentill.yaml
index 4bd492d..4bd492d 100644
--- a/data/items/marrentill.yaml
+++ b/data/items/materials/marrentill.yaml
diff --git a/data/items/mithril_bar.yaml b/data/items/materials/mithril_bar.yaml
index 00e97a4..00e97a4 100644
--- a/data/items/mithril_bar.yaml
+++ b/data/items/materials/mithril_bar.yaml
diff --git a/data/items/mithril_nails.yaml b/data/items/materials/mithril_nails.yaml
index aeb0544..aeb0544 100644
--- a/data/items/mithril_nails.yaml
+++ b/data/items/materials/mithril_nails.yaml
diff --git a/data/items/mithril_ore.yaml b/data/items/materials/mithril_ore.yaml
index 55d8d2c..55d8d2c 100644
--- a/data/items/mithril_ore.yaml
+++ b/data/items/materials/mithril_ore.yaml
diff --git a/data/items/oak_logs.yaml b/data/items/materials/oak_logs.yaml
index 840ebfd..840ebfd 100644
--- a/data/items/oak_logs.yaml
+++ b/data/items/materials/oak_logs.yaml
diff --git a/data/items/oak_planks.yaml b/data/items/materials/oak_planks.yaml
index 29376c6..29376c6 100644
--- a/data/items/oak_planks.yaml
+++ b/data/items/materials/oak_planks.yaml
diff --git a/data/items/planks.yaml b/data/items/materials/planks.yaml
index 67de72e..67de72e 100644
--- a/data/items/planks.yaml
+++ b/data/items/materials/planks.yaml
diff --git a/data/items/potato_cactus.yaml b/data/items/materials/potato_cactus.yaml
index 1178727..1178727 100644
--- a/data/items/potato_cactus.yaml
+++ b/data/items/materials/potato_cactus.yaml
diff --git a/data/items/ranarr.yaml b/data/items/materials/ranarr.yaml
index 683cce6..683cce6 100644
--- a/data/items/ranarr.yaml
+++ b/data/items/materials/ranarr.yaml
diff --git a/data/items/redwood_logs.yaml b/data/items/materials/redwood_logs.yaml
index 5ea1ab0..5ea1ab0 100644
--- a/data/items/redwood_logs.yaml
+++ b/data/items/materials/redwood_logs.yaml
diff --git a/data/items/ruby.yaml b/data/items/materials/ruby.yaml
index 644e1bf..644e1bf 100644
--- a/data/items/ruby.yaml
+++ b/data/items/materials/ruby.yaml
diff --git a/data/items/rune_nails.yaml b/data/items/materials/rune_nails.yaml
index 5d2dfc5..5d2dfc5 100644
--- a/data/items/rune_nails.yaml
+++ b/data/items/materials/rune_nails.yaml
diff --git a/data/items/runite_bar.yaml b/data/items/materials/runite_bar.yaml
index 1faff69..1faff69 100644
--- a/data/items/runite_bar.yaml
+++ b/data/items/materials/runite_bar.yaml
diff --git a/data/items/runite_ore.yaml b/data/items/materials/runite_ore.yaml
index 05d3248..05d3248 100644
--- a/data/items/runite_ore.yaml
+++ b/data/items/materials/runite_ore.yaml
diff --git a/data/items/sacred_eel.yaml b/data/items/materials/sacred_eel.yaml
index 9a03940..9a03940 100644
--- a/data/items/sacred_eel.yaml
+++ b/data/items/materials/sacred_eel.yaml
diff --git a/data/items/salt.yaml b/data/items/materials/salt.yaml
index d9c1b2a..d9c1b2a 100644
--- a/data/items/salt.yaml
+++ b/data/items/materials/salt.yaml
diff --git a/data/items/sapphire.yaml b/data/items/materials/sapphire.yaml
index 9710d45..9710d45 100644
--- a/data/items/sapphire.yaml
+++ b/data/items/materials/sapphire.yaml
diff --git a/data/items/silver_bar.yaml b/data/items/materials/silver_bar.yaml
index eccb25f..eccb25f 100644
--- a/data/items/silver_bar.yaml
+++ b/data/items/materials/silver_bar.yaml
diff --git a/data/items/silver_ore.yaml b/data/items/materials/silver_ore.yaml
index 5b40ff0..5b40ff0 100644
--- a/data/items/silver_ore.yaml
+++ b/data/items/materials/silver_ore.yaml
diff --git a/data/items/slug_mucus.yaml b/data/items/materials/slug_mucus.yaml
index 620038a..620038a 100644
--- a/data/items/slug_mucus.yaml
+++ b/data/items/materials/slug_mucus.yaml
diff --git a/data/items/snapdragon.yaml b/data/items/materials/snapdragon.yaml
index 0c3ba2f..0c3ba2f 100644
--- a/data/items/snapdragon.yaml
+++ b/data/items/materials/snapdragon.yaml
diff --git a/data/items/snape_grass.yaml b/data/items/materials/snape_grass.yaml
index 59a9b30..59a9b30 100644
--- a/data/items/snape_grass.yaml
+++ b/data/items/materials/snape_grass.yaml
diff --git a/data/items/soft_clay.yaml b/data/items/materials/soft_clay.yaml
index 1ba07e3..018e5ef 100644
--- a/data/items/soft_clay.yaml
+++ b/data/items/materials/soft_clay.yaml
@@ -7,7 +7,7 @@ stackable: false
 ticks: 2
 made_from:
   - items: [clay]
-    qty: 1
+    quantity: 1
   - items: [bucket_of_water, jug_of_water]
-    qty: 1
+    quantity: 1
     byproducts: [empty_bucket, empty_jug]
diff --git a/data/items/steel_bar.yaml b/data/items/materials/steel_bar.yaml
index 450fd5c..450fd5c 100644
--- a/data/items/steel_bar.yaml
+++ b/data/items/materials/steel_bar.yaml
diff --git a/data/items/steel_nails.yaml b/data/items/materials/steel_nails.yaml
index 4890d18..4890d18 100644
--- a/data/items/steel_nails.yaml
+++ b/data/items/materials/steel_nails.yaml
diff --git a/data/items/stim_cell.yaml b/data/items/materials/stim_cell.yaml
index b431532..b431532 100644
--- a/data/items/stim_cell.yaml
+++ b/data/items/materials/stim_cell.yaml
diff --git a/data/items/tarromin.yaml b/data/items/materials/tarromin.yaml
index 5af2573..5af2573 100644
--- a/data/items/tarromin.yaml
+++ b/data/items/materials/tarromin.yaml
diff --git a/data/items/teak_logs.yaml b/data/items/materials/teak_logs.yaml
index c69f807..c69f807 100644
--- a/data/items/teak_logs.yaml
+++ b/data/items/materials/teak_logs.yaml
diff --git a/data/items/teak_planks.yaml b/data/items/materials/teak_planks.yaml
index f0a0642..f0a0642 100644
--- a/data/items/teak_planks.yaml
+++ b/data/items/materials/teak_planks.yaml
diff --git a/data/items/thread.yaml b/data/items/materials/thread.yaml
index 3a9a4f7..3a9a4f7 100644
--- a/data/items/thread.yaml
+++ b/data/items/materials/thread.yaml
diff --git a/data/items/tin_ore.yaml b/data/items/materials/tin_ore.yaml
index 0ae1cd0..0ae1cd0 100644
--- a/data/items/tin_ore.yaml
+++ b/data/items/materials/tin_ore.yaml
diff --git a/data/items/toadflax.yaml b/data/items/materials/toadflax.yaml
index 0de8f01..0de8f01 100644
--- a/data/items/toadflax.yaml
+++ b/data/items/materials/toadflax.yaml
diff --git a/data/items/torstol.yaml b/data/items/materials/torstol.yaml
index a8b8fbb..a8b8fbb 100644
--- a/data/items/torstol.yaml
+++ b/data/items/materials/torstol.yaml
diff --git a/data/items/uncut_diamond.yaml b/data/items/materials/uncut_diamond.yaml
index cf41d70..cf41d70 100644
--- a/data/items/uncut_diamond.yaml
+++ b/data/items/materials/uncut_diamond.yaml
diff --git a/data/items/uncut_emerald.yaml b/data/items/materials/uncut_emerald.yaml
index 1ea217a..1ea217a 100644
--- a/data/items/uncut_emerald.yaml
+++ b/data/items/materials/uncut_emerald.yaml
diff --git a/data/items/uncut_ruby.yaml b/data/items/materials/uncut_ruby.yaml
index dfa8188..dfa8188 100644
--- a/data/items/uncut_ruby.yaml
+++ b/data/items/materials/uncut_ruby.yaml
diff --git a/data/items/uncut_sapphire.yaml b/data/items/materials/uncut_sapphire.yaml
index bf073fa..bf073fa 100644
--- a/data/items/uncut_sapphire.yaml
+++ b/data/items/materials/uncut_sapphire.yaml
diff --git a/data/items/vial.yaml b/data/items/materials/vial.yaml
index 2a5260a..2a5260a 100644
--- a/data/items/vial.yaml
+++ b/data/items/materials/vial.yaml
diff --git a/data/items/white_berries.yaml b/data/items/materials/white_berries.yaml
index bdaa993..bdaa993 100644
--- a/data/items/white_berries.yaml
+++ b/data/items/materials/white_berries.yaml
diff --git a/data/items/willow_logs.yaml b/data/items/materials/willow_logs.yaml
index dbd315b..dbd315b 100644
--- a/data/items/willow_logs.yaml
+++ b/data/items/materials/willow_logs.yaml
diff --git a/data/items/wool.yaml b/data/items/materials/wool.yaml
index f557aaf..f557aaf 100644
--- a/data/items/wool.yaml
+++ b/data/items/materials/wool.yaml
diff --git a/data/items/yew_logs.yaml b/data/items/materials/yew_logs.yaml
index a5a86a2..a5a86a2 100644
--- a/data/items/yew_logs.yaml
+++ b/data/items/materials/yew_logs.yaml
diff --git a/data/items/birds_nest.yaml b/data/items/misc/birds_nest.yaml
index 1366b5d..1366b5d 100644
--- a/data/items/birds_nest.yaml
+++ b/data/items/misc/birds_nest.yaml
diff --git a/data/items/christmas_cracker.yaml b/data/items/misc/christmas_cracker.yaml
index c296443..c296443 100644
--- a/data/items/christmas_cracker.yaml
+++ b/data/items/misc/christmas_cracker.yaml
diff --git a/data/items/circuit_board.yaml b/data/items/misc/circuit_board.yaml
index 5b4db83..5b4db83 100644
--- a/data/items/circuit_board.yaml
+++ b/data/items/misc/circuit_board.yaml
diff --git a/data/items/credit_stick.yaml b/data/items/misc/credit_stick.yaml
index 46b3050..46b3050 100644
--- a/data/items/credit_stick.yaml
+++ b/data/items/misc/credit_stick.yaml
diff --git a/data/items/credits.yaml b/data/items/misc/credits.yaml
index 7e2de10..7e2de10 100644
--- a/data/items/credits.yaml
+++ b/data/items/misc/credits.yaml
diff --git a/data/items/mahogany_table.yaml b/data/items/misc/mahogany_table.yaml
index 245b929..245b929 100644
--- a/data/items/mahogany_table.yaml
+++ b/data/items/misc/mahogany_table.yaml
diff --git a/data/items/nutrient_bar.yaml b/data/items/misc/nutrient_bar.yaml
index d33d7de..d33d7de 100644
--- a/data/items/nutrient_bar.yaml
+++ b/data/items/misc/nutrient_bar.yaml
diff --git a/data/items/oak_shelf.yaml b/data/items/misc/oak_shelf.yaml
index 0f08fa5..0f08fa5 100644
--- a/data/items/oak_shelf.yaml
+++ b/data/items/misc/oak_shelf.yaml
diff --git a/data/items/oak_table.yaml b/data/items/misc/oak_table.yaml
index e94b372..e94b372 100644
--- a/data/items/oak_table.yaml
+++ b/data/items/misc/oak_table.yaml
diff --git a/data/items/pass_stub.yaml b/data/items/misc/pass_stub.yaml
index 1068190..1068190 100644
--- a/data/items/pass_stub.yaml
+++ b/data/items/misc/pass_stub.yaml
diff --git a/data/items/scrap_metal.yaml b/data/items/misc/scrap_metal.yaml
index d9b805e..d9b805e 100644
--- a/data/items/scrap_metal.yaml
+++ b/data/items/misc/scrap_metal.yaml
diff --git a/data/items/teak_table.yaml b/data/items/misc/teak_table.yaml
index 5c2c5c5..5c2c5c5 100644
--- a/data/items/teak_table.yaml
+++ b/data/items/misc/teak_table.yaml
diff --git a/data/items/wooden_chair.yaml b/data/items/misc/wooden_chair.yaml
index 16220ef..16220ef 100644
--- a/data/items/wooden_chair.yaml
+++ b/data/items/misc/wooden_chair.yaml
diff --git a/data/items/wooden_shelf.yaml b/data/items/misc/wooden_shelf.yaml
index 3b0d97d..3b0d97d 100644
--- a/data/items/wooden_shelf.yaml
+++ b/data/items/misc/wooden_shelf.yaml
diff --git a/data/items/wooden_table.yaml b/data/items/misc/wooden_table.yaml
index 171a9bb..171a9bb 100644
--- a/data/items/wooden_table.yaml
+++ b/data/items/misc/wooden_table.yaml
diff --git a/data/items/avantoe_seed.yaml b/data/items/seeds/avantoe_seed.yaml
index fb7b427..fb7b427 100644
--- a/data/items/avantoe_seed.yaml
+++ b/data/items/seeds/avantoe_seed.yaml
diff --git a/data/items/cabbage_seed.yaml b/data/items/seeds/cabbage_seed.yaml
index 8a6db33..8a6db33 100644
--- a/data/items/cabbage_seed.yaml
+++ b/data/items/seeds/cabbage_seed.yaml
diff --git a/data/items/cadantine_seed.yaml b/data/items/seeds/cadantine_seed.yaml
index 8326033..8326033 100644
--- a/data/items/cadantine_seed.yaml
+++ b/data/items/seeds/cadantine_seed.yaml
diff --git a/data/items/dwarf_weed_seed.yaml b/data/items/seeds/dwarf_weed_seed.yaml
index c8ba6f2..c8ba6f2 100644
--- a/data/items/dwarf_weed_seed.yaml
+++ b/data/items/seeds/dwarf_weed_seed.yaml
diff --git a/data/items/guam_seed.yaml b/data/items/seeds/guam_seed.yaml
index b55e1a8..b55e1a8 100644
--- a/data/items/guam_seed.yaml
+++ b/data/items/seeds/guam_seed.yaml
diff --git a/data/items/harralander_seed.yaml b/data/items/seeds/harralander_seed.yaml
index 5be3571..5be3571 100644
--- a/data/items/harralander_seed.yaml
+++ b/data/items/seeds/harralander_seed.yaml
diff --git a/data/items/irit_seed.yaml b/data/items/seeds/irit_seed.yaml
index 4b8bad2..4b8bad2 100644
--- a/data/items/irit_seed.yaml
+++ b/data/items/seeds/irit_seed.yaml
diff --git a/data/items/kwuarm_seed.yaml b/data/items/seeds/kwuarm_seed.yaml
index 053c2f3..053c2f3 100644
--- a/data/items/kwuarm_seed.yaml
+++ b/data/items/seeds/kwuarm_seed.yaml
diff --git a/data/items/lantadyme_seed.yaml b/data/items/seeds/lantadyme_seed.yaml
index f4be89c..f4be89c 100644
--- a/data/items/lantadyme_seed.yaml
+++ b/data/items/seeds/lantadyme_seed.yaml
diff --git a/data/items/marrentill_seed.yaml b/data/items/seeds/marrentill_seed.yaml
index 4b42353..4b42353 100644
--- a/data/items/marrentill_seed.yaml
+++ b/data/items/seeds/marrentill_seed.yaml
diff --git a/data/items/onion_seed.yaml b/data/items/seeds/onion_seed.yaml
index a1231ad..a1231ad 100644
--- a/data/items/onion_seed.yaml
+++ b/data/items/seeds/onion_seed.yaml
diff --git a/data/items/potato_seed.yaml b/data/items/seeds/potato_seed.yaml
index 9daee8a..9daee8a 100644
--- a/data/items/potato_seed.yaml
+++ b/data/items/seeds/potato_seed.yaml
diff --git a/data/items/ranarr_seed.yaml b/data/items/seeds/ranarr_seed.yaml
index ef54c0d..ef54c0d 100644
--- a/data/items/ranarr_seed.yaml
+++ b/data/items/seeds/ranarr_seed.yaml
diff --git a/data/items/snapdragon_seed.yaml b/data/items/seeds/snapdragon_seed.yaml
index 06f2a9e..06f2a9e 100644
--- a/data/items/snapdragon_seed.yaml
+++ b/data/items/seeds/snapdragon_seed.yaml
diff --git a/data/items/strawberry_seed.yaml b/data/items/seeds/strawberry_seed.yaml
index 8b2f45c..8b2f45c 100644
--- a/data/items/strawberry_seed.yaml
+++ b/data/items/seeds/strawberry_seed.yaml
diff --git a/data/items/sweetcorn_seed.yaml b/data/items/seeds/sweetcorn_seed.yaml
index d85b35b..d85b35b 100644
--- a/data/items/sweetcorn_seed.yaml
+++ b/data/items/seeds/sweetcorn_seed.yaml
diff --git a/data/items/tarromin_seed.yaml b/data/items/seeds/tarromin_seed.yaml
index c10483a..c10483a 100644
--- a/data/items/tarromin_seed.yaml
+++ b/data/items/seeds/tarromin_seed.yaml
diff --git a/data/items/toadflax_seed.yaml b/data/items/seeds/toadflax_seed.yaml
index 1ef6cb2..1ef6cb2 100644
--- a/data/items/toadflax_seed.yaml
+++ b/data/items/seeds/toadflax_seed.yaml
diff --git a/data/items/tomato_seed.yaml b/data/items/seeds/tomato_seed.yaml
index c1db131..c1db131 100644
--- a/data/items/tomato_seed.yaml
+++ b/data/items/seeds/tomato_seed.yaml
diff --git a/data/items/torstol_seed.yaml b/data/items/seeds/torstol_seed.yaml
index 2dfd60c..2dfd60c 100644
--- a/data/items/torstol_seed.yaml
+++ b/data/items/seeds/torstol_seed.yaml
diff --git a/data/items/watermelon_seed.yaml b/data/items/seeds/watermelon_seed.yaml
index 7ea59c6..7ea59c6 100644
--- a/data/items/watermelon_seed.yaml
+++ b/data/items/seeds/watermelon_seed.yaml
diff --git a/data/items/adamant_axe.yaml b/data/items/tools/adamant_axe.yaml
index 81232fe..81232fe 100644
--- a/data/items/adamant_axe.yaml
+++ b/data/items/tools/adamant_axe.yaml
diff --git a/data/items/adamant_pickaxe.yaml b/data/items/tools/adamant_pickaxe.yaml
index 4296b0d..4296b0d 100644
--- a/data/items/adamant_pickaxe.yaml
+++ b/data/items/tools/adamant_pickaxe.yaml
diff --git a/data/items/amulet_mould.yaml b/data/items/tools/amulet_mould.yaml
index a8153cb..a8153cb 100644
--- a/data/items/amulet_mould.yaml
+++ b/data/items/tools/amulet_mould.yaml
diff --git a/data/items/big_fishing_net.yaml b/data/items/tools/big_fishing_net.yaml
index a8b5352..a8b5352 100644
--- a/data/items/big_fishing_net.yaml
+++ b/data/items/tools/big_fishing_net.yaml
diff --git a/data/items/black_pickaxe.yaml b/data/items/tools/black_pickaxe.yaml
index c3df955..c3df955 100644
--- a/data/items/black_pickaxe.yaml
+++ b/data/items/tools/black_pickaxe.yaml
diff --git a/data/items/bracelet_mould.yaml b/data/items/tools/bracelet_mould.yaml
index 78bc099..78bc099 100644
--- a/data/items/bracelet_mould.yaml
+++ b/data/items/tools/bracelet_mould.yaml
diff --git a/data/items/bronze_axe.yaml b/data/items/tools/bronze_axe.yaml
index 84b2762..84b2762 100644
--- a/data/items/bronze_axe.yaml
+++ b/data/items/tools/bronze_axe.yaml
diff --git a/data/items/bronze_pickaxe.yaml b/data/items/tools/bronze_pickaxe.yaml
index b581fc0..b581fc0 100644
--- a/data/items/bronze_pickaxe.yaml
+++ b/data/items/tools/bronze_pickaxe.yaml
diff --git a/data/items/chisel.yaml b/data/items/tools/chisel.yaml
index a99c828..a99c828 100644
--- a/data/items/chisel.yaml
+++ b/data/items/tools/chisel.yaml
diff --git a/data/items/dragon_pickaxe.yaml b/data/items/tools/dragon_pickaxe.yaml
index 6f187b8..6f187b8 100644
--- a/data/items/dragon_pickaxe.yaml
+++ b/data/items/tools/dragon_pickaxe.yaml
diff --git a/data/items/empty_bucket.yaml b/data/items/tools/empty_bucket.yaml
index 6debb02..6debb02 100644
--- a/data/items/empty_bucket.yaml
+++ b/data/items/tools/empty_bucket.yaml
diff --git a/data/items/empty_jug.yaml b/data/items/tools/empty_jug.yaml
index c6774a5..c6774a5 100644
--- a/data/items/empty_jug.yaml
+++ b/data/items/tools/empty_jug.yaml
diff --git a/data/items/empty_pot.yaml b/data/items/tools/empty_pot.yaml
index a57b441..a57b441 100644
--- a/data/items/empty_pot.yaml
+++ b/data/items/tools/empty_pot.yaml
diff --git a/data/items/firesteel.yaml b/data/items/tools/firesteel.yaml
index b3f9302..b3f9302 100644
--- a/data/items/firesteel.yaml
+++ b/data/items/tools/firesteel.yaml
diff --git a/data/items/fishing_bait.yaml b/data/items/tools/fishing_bait.yaml
index 2336a7d..2336a7d 100644
--- a/data/items/fishing_bait.yaml
+++ b/data/items/tools/fishing_bait.yaml
diff --git a/data/items/fishing_rod.yaml b/data/items/tools/fishing_rod.yaml
index a48c0a1..a48c0a1 100644
--- a/data/items/fishing_rod.yaml
+++ b/data/items/tools/fishing_rod.yaml
diff --git a/data/items/fly_fishing_rod.yaml b/data/items/tools/fly_fishing_rod.yaml
index c0f3f78..c0f3f78 100644
--- a/data/items/fly_fishing_rod.yaml
+++ b/data/items/tools/fly_fishing_rod.yaml
diff --git a/data/items/hammer.yaml b/data/items/tools/hammer.yaml
index 74302a4..74302a4 100644
--- a/data/items/hammer.yaml
+++ b/data/items/tools/hammer.yaml
diff --git a/data/items/harpoon.yaml b/data/items/tools/harpoon.yaml
index 1412d5c..1412d5c 100644
--- a/data/items/harpoon.yaml
+++ b/data/items/tools/harpoon.yaml
diff --git a/data/items/iron_axe.yaml b/data/items/tools/iron_axe.yaml
index 3f989ca..3f989ca 100644
--- a/data/items/iron_axe.yaml
+++ b/data/items/tools/iron_axe.yaml
diff --git a/data/items/iron_pickaxe.yaml b/data/items/tools/iron_pickaxe.yaml
index d120fde..d120fde 100644
--- a/data/items/iron_pickaxe.yaml
+++ b/data/items/tools/iron_pickaxe.yaml
diff --git a/data/items/knife.yaml b/data/items/tools/knife.yaml
index fddf120..fddf120 100644
--- a/data/items/knife.yaml
+++ b/data/items/tools/knife.yaml
diff --git a/data/items/lighter.yaml b/data/items/tools/lighter.yaml
index 567f42e..567f42e 100644
--- a/data/items/lighter.yaml
+++ b/data/items/tools/lighter.yaml
diff --git a/data/items/lobster_pot.yaml b/data/items/tools/lobster_pot.yaml
index 79771c1..79771c1 100644
--- a/data/items/lobster_pot.yaml
+++ b/data/items/tools/lobster_pot.yaml
diff --git a/data/items/matches.yaml b/data/items/tools/matches.yaml
index d816cbc..d816cbc 100644
--- a/data/items/matches.yaml
+++ b/data/items/tools/matches.yaml
diff --git a/data/items/mithril_axe.yaml b/data/items/tools/mithril_axe.yaml
index ca18195..ca18195 100644
--- a/data/items/mithril_axe.yaml
+++ b/data/items/tools/mithril_axe.yaml
diff --git a/data/items/mithril_pickaxe.yaml b/data/items/tools/mithril_pickaxe.yaml
index 5da6937..5da6937 100644
--- a/data/items/mithril_pickaxe.yaml
+++ b/data/items/tools/mithril_pickaxe.yaml
diff --git a/data/items/necklace_mould.yaml b/data/items/tools/necklace_mould.yaml
index bc4df45..bc4df45 100644
--- a/data/items/necklace_mould.yaml
+++ b/data/items/tools/necklace_mould.yaml
diff --git a/data/items/needle.yaml b/data/items/tools/needle.yaml
index 5f53bf3..5f53bf3 100644
--- a/data/items/needle.yaml
+++ b/data/items/tools/needle.yaml
diff --git a/data/items/plant_pot.yaml b/data/items/tools/plant_pot.yaml
index 2f81e08..2f81e08 100644
--- a/data/items/plant_pot.yaml
+++ b/data/items/tools/plant_pot.yaml
diff --git a/data/items/rake.yaml b/data/items/tools/rake.yaml
index 5949626..5949626 100644
--- a/data/items/rake.yaml
+++ b/data/items/tools/rake.yaml
diff --git a/data/items/ring_mould.yaml b/data/items/tools/ring_mould.yaml
index d7846c8..d7846c8 100644
--- a/data/items/ring_mould.yaml
+++ b/data/items/tools/ring_mould.yaml
diff --git a/data/items/rune_axe.yaml b/data/items/tools/rune_axe.yaml
index a694bdf..a694bdf 100644
--- a/data/items/rune_axe.yaml
+++ b/data/items/tools/rune_axe.yaml
diff --git a/data/items/rune_pickaxe.yaml b/data/items/tools/rune_pickaxe.yaml
index 265231d..265231d 100644
--- a/data/items/rune_pickaxe.yaml
+++ b/data/items/tools/rune_pickaxe.yaml
diff --git a/data/items/saw.yaml b/data/items/tools/saw.yaml
index 4a7ad6a..4a7ad6a 100644
--- a/data/items/saw.yaml
+++ b/data/items/tools/saw.yaml
diff --git a/data/items/shears.yaml b/data/items/tools/shears.yaml
index 4166be3..4166be3 100644
--- a/data/items/shears.yaml
+++ b/data/items/tools/shears.yaml
diff --git a/data/items/small_fishing_net.yaml b/data/items/tools/small_fishing_net.yaml
index 9e91f8f..9e91f8f 100644
--- a/data/items/small_fishing_net.yaml
+++ b/data/items/tools/small_fishing_net.yaml
diff --git a/data/items/spade.yaml b/data/items/tools/spade.yaml
index 7d0b465..7d0b465 100644
--- a/data/items/spade.yaml
+++ b/data/items/tools/spade.yaml
diff --git a/data/items/steel_axe.yaml b/data/items/tools/steel_axe.yaml
index 6f2ac99..6f2ac99 100644
--- a/data/items/steel_axe.yaml
+++ b/data/items/tools/steel_axe.yaml
diff --git a/data/items/steel_pickaxe.yaml b/data/items/tools/steel_pickaxe.yaml
index cc048a1..cc048a1 100644
--- a/data/items/steel_pickaxe.yaml
+++ b/data/items/tools/steel_pickaxe.yaml
diff --git a/data/items/unfired_pie_dish.yaml b/data/items/tools/unfired_pie_dish.yaml
index fddc4d1..fddc4d1 100644
--- a/data/items/unfired_pie_dish.yaml
+++ b/data/items/tools/unfired_pie_dish.yaml
diff --git a/data/items/unfired_plant_pot.yaml b/data/items/tools/unfired_plant_pot.yaml
index c088242..c088242 100644
--- a/data/items/unfired_plant_pot.yaml
+++ b/data/items/tools/unfired_plant_pot.yaml
diff --git a/data/items/unfired_pot.yaml b/data/items/tools/unfired_pot.yaml
index 265a19f..265a19f 100644
--- a/data/items/unfired_pot.yaml
+++ b/data/items/tools/unfired_pot.yaml
diff --git a/data/items/watering_can.yaml b/data/items/tools/watering_can.yaml
index 4a75de9..4a75de9 100644
--- a/data/items/watering_can.yaml
+++ b/data/items/tools/watering_can.yaml