diff --git a/assets/common/items/armor/belt/assassin.ron b/assets/common/items/armor/assassin/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/assassin.ron
rename to assets/common/items/armor/assassin/belt.ron
diff --git a/assets/common/items/armor/chest/assassin.ron b/assets/common/items/armor/assassin/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/assassin.ron
rename to assets/common/items/armor/assassin/chest.ron
diff --git a/assets/common/items/armor/foot/assassin.ron b/assets/common/items/armor/assassin/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/assassin.ron
rename to assets/common/items/armor/assassin/foot.ron
diff --git a/assets/common/items/armor/hand/assassin.ron b/assets/common/items/armor/assassin/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/assassin.ron
rename to assets/common/items/armor/assassin/hand.ron
diff --git a/assets/common/items/armor/head/assa_mask_0.ron b/assets/common/items/armor/assassin/head.ron
similarity index 100%
rename from assets/common/items/armor/head/assa_mask_0.ron
rename to assets/common/items/armor/assassin/head.ron
diff --git a/assets/common/items/armor/pants/assassin.ron b/assets/common/items/armor/assassin/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/assassin.ron
rename to assets/common/items/armor/assassin/pants.ron
diff --git a/assets/common/items/armor/shoulder/assassin.ron b/assets/common/items/armor/assassin/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/assassin.ron
rename to assets/common/items/armor/assassin/shoulder.ron
diff --git a/assets/common/items/armor/belt/bonerattler.ron b/assets/common/items/armor/bonerattler/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/bonerattler.ron
rename to assets/common/items/armor/bonerattler/belt.ron
diff --git a/assets/common/items/armor/chest/bonerattler.ron b/assets/common/items/armor/bonerattler/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/bonerattler.ron
rename to assets/common/items/armor/bonerattler/chest.ron
diff --git a/assets/common/items/armor/foot/bonerattler.ron b/assets/common/items/armor/bonerattler/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/bonerattler.ron
rename to assets/common/items/armor/bonerattler/foot.ron
diff --git a/assets/common/items/armor/hand/bonerattler.ron b/assets/common/items/armor/bonerattler/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/bonerattler.ron
rename to assets/common/items/armor/bonerattler/hand.ron
diff --git a/assets/common/items/armor/pants/bonerattler.ron b/assets/common/items/armor/bonerattler/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/bonerattler.ron
rename to assets/common/items/armor/bonerattler/pants.ron
diff --git a/assets/common/items/armor/shoulder/bonerattler.ron b/assets/common/items/armor/bonerattler/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/bonerattler.ron
rename to assets/common/items/armor/bonerattler/shoulder.ron
diff --git a/assets/common/items/armor/belt/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/belt.ron
diff --git a/assets/common/items/armor/chest/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/chest.ron
diff --git a/assets/common/items/armor/foot/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/foot.ron
diff --git a/assets/common/items/armor/hand/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/hand.ron
diff --git a/assets/common/items/armor/pants/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/pants.ron
diff --git a/assets/common/items/armor/shoulder/cloth_blue_0.ron b/assets/common/items/armor/cloth_blue/shoulder_0.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cloth_blue_0.ron
rename to assets/common/items/armor/cloth_blue/shoulder_0.ron
diff --git a/assets/common/items/armor/shoulder/cloth_blue_1.ron b/assets/common/items/armor/cloth_blue/shoulder_1.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cloth_blue_1.ron
rename to assets/common/items/armor/cloth_blue/shoulder_1.ron
diff --git a/assets/common/items/armor/belt/cloth_green_0.ron b/assets/common/items/armor/cloth_green/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/belt.ron
diff --git a/assets/common/items/armor/chest/cloth_green_0.ron b/assets/common/items/armor/cloth_green/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/chest.ron
diff --git a/assets/common/items/armor/foot/cloth_green_0.ron b/assets/common/items/armor/cloth_green/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/foot.ron
diff --git a/assets/common/items/armor/hand/cloth_green_0.ron b/assets/common/items/armor/cloth_green/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/hand.ron
diff --git a/assets/common/items/armor/pants/cloth_green_0.ron b/assets/common/items/armor/cloth_green/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/pants.ron
diff --git a/assets/common/items/armor/shoulder/cloth_green_0.ron b/assets/common/items/armor/cloth_green/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cloth_green_0.ron
rename to assets/common/items/armor/cloth_green/shoulder.ron
diff --git a/assets/common/items/armor/belt/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/belt.ron
diff --git a/assets/common/items/armor/chest/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/chest.ron
diff --git a/assets/common/items/armor/foot/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/foot.ron
diff --git a/assets/common/items/armor/hand/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/hand.ron
diff --git a/assets/common/items/armor/pants/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/pants.ron
diff --git a/assets/common/items/armor/shoulder/cloth_purple_0.ron b/assets/common/items/armor/cloth_purple/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cloth_purple_0.ron
rename to assets/common/items/armor/cloth_purple/shoulder.ron
diff --git a/assets/common/items/armor/belt/cultist_belt.ron b/assets/common/items/armor/cultist/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/cultist_belt.ron
rename to assets/common/items/armor/cultist/belt.ron
diff --git a/assets/common/items/armor/chest/cultist_chest_blue.ron b/assets/common/items/armor/cultist/chest_blue.ron
similarity index 100%
rename from assets/common/items/armor/chest/cultist_chest_blue.ron
rename to assets/common/items/armor/cultist/chest_blue.ron
diff --git a/assets/common/items/armor/chest/cultist_chest_purple.ron b/assets/common/items/armor/cultist/chest_purple.ron
similarity index 100%
rename from assets/common/items/armor/chest/cultist_chest_purple.ron
rename to assets/common/items/armor/cultist/chest_purple.ron
diff --git a/assets/common/items/armor/foot/cultist_boots.ron b/assets/common/items/armor/cultist/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/cultist_boots.ron
rename to assets/common/items/armor/cultist/foot.ron
diff --git a/assets/common/items/armor/hand/cultist_hands_blue.ron b/assets/common/items/armor/cultist/hand_blue.ron
similarity index 100%
rename from assets/common/items/armor/hand/cultist_hands_blue.ron
rename to assets/common/items/armor/cultist/hand_blue.ron
diff --git a/assets/common/items/armor/hand/cultist_hands_purple.ron b/assets/common/items/armor/cultist/hand_purple.ron
similarity index 100%
rename from assets/common/items/armor/hand/cultist_hands_purple.ron
rename to assets/common/items/armor/cultist/hand_purple.ron
diff --git a/assets/common/items/armor/pants/cultist_legs_blue.ron b/assets/common/items/armor/cultist/pants_blue.ron
similarity index 100%
rename from assets/common/items/armor/pants/cultist_legs_blue.ron
rename to assets/common/items/armor/cultist/pants_blue.ron
diff --git a/assets/common/items/armor/pants/cultist_legs_purple.ron b/assets/common/items/armor/cultist/pants_purple.ron
similarity index 100%
rename from assets/common/items/armor/pants/cultist_legs_purple.ron
rename to assets/common/items/armor/cultist/pants_purple.ron
diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_blue.ron b/assets/common/items/armor/cultist/shoulder_blue.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cultist_shoulder_blue.ron
rename to assets/common/items/armor/cultist/shoulder_blue.ron
diff --git a/assets/common/items/armor/shoulder/cultist_shoulder_purple.ron b/assets/common/items/armor/cultist/shoulder_purple.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/cultist_shoulder_purple.ron
rename to assets/common/items/armor/cultist/shoulder_purple.ron
diff --git a/assets/common/items/armor/belt/druid.ron b/assets/common/items/armor/druid/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/druid.ron
rename to assets/common/items/armor/druid/belt.ron
diff --git a/assets/common/items/armor/chest/druid.ron b/assets/common/items/armor/druid/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/druid.ron
rename to assets/common/items/armor/druid/chest.ron
diff --git a/assets/common/items/armor/pants/druid.ron b/assets/common/items/armor/druid/druid.ron
similarity index 100%
rename from assets/common/items/armor/pants/druid.ron
rename to assets/common/items/armor/druid/druid.ron
diff --git a/assets/common/items/armor/foot/druid.ron b/assets/common/items/armor/druid/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/druid.ron
rename to assets/common/items/armor/druid/foot.ron
diff --git a/assets/common/items/armor/hand/druid.ron b/assets/common/items/armor/druid/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/druid.ron
rename to assets/common/items/armor/druid/hand.ron
diff --git a/assets/common/items/armor/shoulder/druidshoulder.ron b/assets/common/items/armor/druid/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/druidshoulder.ron
rename to assets/common/items/armor/druid/shoulder.ron
diff --git a/assets/common/items/armor/belt/leather_0.ron b/assets/common/items/armor/leather_0/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/leather_0.ron
rename to assets/common/items/armor/leather_0/belt.ron
diff --git a/assets/common/items/armor/chest/leather_0.ron b/assets/common/items/armor/leather_0/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/leather_0.ron
rename to assets/common/items/armor/leather_0/chest.ron
diff --git a/assets/common/items/armor/foot/leather_0.ron b/assets/common/items/armor/leather_0/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/leather_0.ron
rename to assets/common/items/armor/leather_0/foot.ron
diff --git a/assets/common/items/armor/hand/leather_0.ron b/assets/common/items/armor/leather_0/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/leather_0.ron
rename to assets/common/items/armor/leather_0/hand.ron
diff --git a/assets/common/items/armor/head/leather_0.ron b/assets/common/items/armor/leather_0/head.ron
similarity index 100%
rename from assets/common/items/armor/head/leather_0.ron
rename to assets/common/items/armor/leather_0/head.ron
diff --git a/assets/common/items/armor/pants/leather_0.ron b/assets/common/items/armor/leather_0/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/leather_0.ron
rename to assets/common/items/armor/leather_0/pants.ron
diff --git a/assets/common/items/armor/shoulder/leather_1.ron b/assets/common/items/armor/leather_0/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_1.ron
rename to assets/common/items/armor/leather_0/shoulder.ron
diff --git a/assets/common/items/armor/belt/leather_2.ron b/assets/common/items/armor/leather_1/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/leather_2.ron
rename to assets/common/items/armor/leather_1/belt.ron
diff --git a/assets/common/items/armor/chest/leather_2.ron b/assets/common/items/armor/leather_1/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/leather_2.ron
rename to assets/common/items/armor/leather_1/chest.ron
diff --git a/assets/common/items/armor/foot/leather_2.ron b/assets/common/items/armor/leather_1/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/leather_2.ron
rename to assets/common/items/armor/leather_1/foot.ron
diff --git a/assets/common/items/armor/hand/leather_2.ron b/assets/common/items/armor/leather_1/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/leather_2.ron
rename to assets/common/items/armor/leather_1/hand.ron
diff --git a/assets/common/items/armor/pants/leather_2.ron b/assets/common/items/armor/leather_1/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/leather_2.ron
rename to assets/common/items/armor/leather_1/pants.ron
diff --git a/assets/common/items/armor/shoulder/leather_2.ron b/assets/common/items/armor/leather_1/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_2.ron
rename to assets/common/items/armor/leather_1/shoulder.ron
diff --git a/assets/common/items/armor/back/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/back.ron
similarity index 100%
rename from assets/common/items/armor/back/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/back.ron
diff --git a/assets/common/items/armor/belt/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/belt.ron
diff --git a/assets/common/items/armor/chest/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/chest.ron
diff --git a/assets/common/items/armor/foot/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/foot.ron
diff --git a/assets/common/items/armor/hand/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/hand.ron
diff --git a/assets/common/items/armor/pants/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/pants.ron
diff --git a/assets/common/items/armor/shoulder/leather_adventurer.ron b/assets/common/items/armor/leather_adventurer/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_adventurer.ron
rename to assets/common/items/armor/leather_adventurer/shoulder.ron
diff --git a/assets/common/items/armor/belt/plate_leather_0.ron b/assets/common/items/armor/leather_plate/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/belt.ron
diff --git a/assets/common/items/armor/chest/plate_leather_0.ron b/assets/common/items/armor/leather_plate/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/chest.ron
diff --git a/assets/common/items/armor/foot/plate_leather_0.ron b/assets/common/items/armor/leather_plate/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/foot.ron
diff --git a/assets/common/items/armor/hand/plate_leather_0.ron b/assets/common/items/armor/leather_plate/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/hand.ron
diff --git a/assets/common/items/armor/pants/plate_leather_0.ron b/assets/common/items/armor/leather_plate/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/pants.ron
diff --git a/assets/common/items/armor/shoulder/plate_leather_0.ron b/assets/common/items/armor/leather_plate/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/plate_leather_0.ron
rename to assets/common/items/armor/leather_plate/shoulder.ron
diff --git a/assets/common/items/armor/back/admin.ron b/assets/common/items/armor/misc/back/admin.ron
similarity index 100%
rename from assets/common/items/armor/back/admin.ron
rename to assets/common/items/armor/misc/back/admin.ron
diff --git a/assets/common/items/armor/back/backpack_0.ron b/assets/common/items/armor/misc/back/backpack_0.ron
similarity index 100%
rename from assets/common/items/armor/back/backpack_0.ron
rename to assets/common/items/armor/misc/back/backpack_0.ron
diff --git a/assets/common/items/armor/back/dungeon_purple-0.ron b/assets/common/items/armor/misc/back/dungeon_purple-0.ron
similarity index 100%
rename from assets/common/items/armor/back/dungeon_purple-0.ron
rename to assets/common/items/armor/misc/back/dungeon_purple-0.ron
diff --git a/assets/common/items/armor/back/short_0.ron b/assets/common/items/armor/misc/back/short_0.ron
similarity index 100%
rename from assets/common/items/armor/back/short_0.ron
rename to assets/common/items/armor/misc/back/short_0.ron
diff --git a/assets/common/items/armor/back/short_1.ron b/assets/common/items/armor/misc/back/short_1.ron
similarity index 100%
rename from assets/common/items/armor/back/short_1.ron
rename to assets/common/items/armor/misc/back/short_1.ron
diff --git a/assets/common/items/armor/bag/heavy_seabag.ron b/assets/common/items/armor/misc/bag/heavy_seabag.ron
similarity index 100%
rename from assets/common/items/armor/bag/heavy_seabag.ron
rename to assets/common/items/armor/misc/bag/heavy_seabag.ron
diff --git a/assets/common/items/armor/bag/knitted_red_pouch.ron b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron
similarity index 100%
rename from assets/common/items/armor/bag/knitted_red_pouch.ron
rename to assets/common/items/armor/misc/bag/knitted_red_pouch.ron
diff --git a/assets/common/items/armor/bag/liana_kit.ron b/assets/common/items/armor/misc/bag/liana_kit.ron
similarity index 100%
rename from assets/common/items/armor/bag/liana_kit.ron
rename to assets/common/items/armor/misc/bag/liana_kit.ron
diff --git a/assets/common/items/armor/bag/mindflayer_spellbag.ron b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron
similarity index 100%
rename from assets/common/items/armor/bag/mindflayer_spellbag.ron
rename to assets/common/items/armor/misc/bag/mindflayer_spellbag.ron
diff --git a/assets/common/items/armor/bag/reliable_backpack.ron b/assets/common/items/armor/misc/bag/reliable_backpack.ron
similarity index 100%
rename from assets/common/items/armor/bag/reliable_backpack.ron
rename to assets/common/items/armor/misc/bag/reliable_backpack.ron
diff --git a/assets/common/items/armor/bag/soulkeeper_cursed.ron b/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron
similarity index 100%
rename from assets/common/items/armor/bag/soulkeeper_cursed.ron
rename to assets/common/items/armor/misc/bag/soulkeeper_cursed.ron
diff --git a/assets/common/items/armor/bag/soulkeeper_pure.ron b/assets/common/items/armor/misc/bag/soulkeeper_pure.ron
similarity index 100%
rename from assets/common/items/armor/bag/soulkeeper_pure.ron
rename to assets/common/items/armor/misc/bag/soulkeeper_pure.ron
diff --git a/assets/common/items/armor/bag/sturdy_red_backpack.ron b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron
similarity index 100%
rename from assets/common/items/armor/bag/sturdy_red_backpack.ron
rename to assets/common/items/armor/misc/bag/sturdy_red_backpack.ron
diff --git a/assets/common/items/armor/bag/tiny_leather_pouch.ron b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron
similarity index 100%
rename from assets/common/items/armor/bag/tiny_leather_pouch.ron
rename to assets/common/items/armor/misc/bag/tiny_leather_pouch.ron
diff --git a/assets/common/items/armor/bag/tiny_red_pouch.ron b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron
similarity index 100%
rename from assets/common/items/armor/bag/tiny_red_pouch.ron
rename to assets/common/items/armor/misc/bag/tiny_red_pouch.ron
diff --git a/assets/common/items/armor/bag/troll_hide_pack.ron b/assets/common/items/armor/misc/bag/troll_hide_pack.ron
similarity index 100%
rename from assets/common/items/armor/bag/troll_hide_pack.ron
rename to assets/common/items/armor/misc/bag/troll_hide_pack.ron
diff --git a/assets/common/items/armor/bag/woven_red_bag.ron b/assets/common/items/armor/misc/bag/woven_red_bag.ron
similarity index 100%
rename from assets/common/items/armor/bag/woven_red_bag.ron
rename to assets/common/items/armor/misc/bag/woven_red_bag.ron
diff --git a/assets/common/items/armor/chest/worker_green_0.ron b/assets/common/items/armor/misc/chest/worker_green_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_green_0.ron
rename to assets/common/items/armor/misc/chest/worker_green_0.ron
diff --git a/assets/common/items/armor/chest/worker_green_1.ron b/assets/common/items/armor/misc/chest/worker_green_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_green_1.ron
rename to assets/common/items/armor/misc/chest/worker_green_1.ron
diff --git a/assets/common/items/armor/chest/worker_orange_0.ron b/assets/common/items/armor/misc/chest/worker_orange_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_orange_0.ron
rename to assets/common/items/armor/misc/chest/worker_orange_0.ron
diff --git a/assets/common/items/armor/chest/worker_orange_1.ron b/assets/common/items/armor/misc/chest/worker_orange_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_orange_1.ron
rename to assets/common/items/armor/misc/chest/worker_orange_1.ron
diff --git a/assets/common/items/armor/chest/worker_purple_0.ron b/assets/common/items/armor/misc/chest/worker_purple_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_purple_0.ron
rename to assets/common/items/armor/misc/chest/worker_purple_0.ron
diff --git a/assets/common/items/armor/chest/worker_purple_1.ron b/assets/common/items/armor/misc/chest/worker_purple_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_purple_1.ron
rename to assets/common/items/armor/misc/chest/worker_purple_1.ron
diff --git a/assets/common/items/armor/chest/worker_red_0.ron b/assets/common/items/armor/misc/chest/worker_red_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_red_0.ron
rename to assets/common/items/armor/misc/chest/worker_red_0.ron
diff --git a/assets/common/items/armor/chest/worker_red_1.ron b/assets/common/items/armor/misc/chest/worker_red_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_red_1.ron
rename to assets/common/items/armor/misc/chest/worker_red_1.ron
diff --git a/assets/common/items/armor/chest/worker_yellow_0.ron b/assets/common/items/armor/misc/chest/worker_yellow_0.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_yellow_0.ron
rename to assets/common/items/armor/misc/chest/worker_yellow_0.ron
diff --git a/assets/common/items/armor/chest/worker_yellow_1.ron b/assets/common/items/armor/misc/chest/worker_yellow_1.ron
similarity index 100%
rename from assets/common/items/armor/chest/worker_yellow_1.ron
rename to assets/common/items/armor/misc/chest/worker_yellow_1.ron
diff --git a/assets/common/items/armor/foot/jackalope_slippers.ron b/assets/common/items/armor/misc/foot/jackalope_slippers.ron
similarity index 100%
rename from assets/common/items/armor/foot/jackalope_slippers.ron
rename to assets/common/items/armor/misc/foot/jackalope_slippers.ron
diff --git a/assets/common/items/armor/foot/sandals_0.ron b/assets/common/items/armor/misc/foot/sandals.ron
similarity index 100%
rename from assets/common/items/armor/foot/sandals_0.ron
rename to assets/common/items/armor/misc/foot/sandals.ron
diff --git a/assets/common/items/armor/neck/neck_0.ron b/assets/common/items/armor/misc/neck/neck_0.ron
similarity index 100%
rename from assets/common/items/armor/neck/neck_0.ron
rename to assets/common/items/armor/misc/neck/neck_0.ron
diff --git a/assets/common/items/armor/neck/neck_1.ron b/assets/common/items/armor/misc/neck/neck_1.ron
similarity index 100%
rename from assets/common/items/armor/neck/neck_1.ron
rename to assets/common/items/armor/misc/neck/neck_1.ron
diff --git a/assets/common/items/armor/neck/neck_2.ron b/assets/common/items/armor/misc/neck/neck_2.ron
similarity index 100%
rename from assets/common/items/armor/neck/neck_2.ron
rename to assets/common/items/armor/misc/neck/neck_2.ron
diff --git a/assets/common/items/armor/pants/hunting.ron b/assets/common/items/armor/misc/pants/hunting.ron
similarity index 100%
rename from assets/common/items/armor/pants/hunting.ron
rename to assets/common/items/armor/misc/pants/hunting.ron
diff --git a/assets/common/items/armor/pants/worker_blue_0.ron b/assets/common/items/armor/misc/pants/worker_blue.ron
similarity index 100%
rename from assets/common/items/armor/pants/worker_blue_0.ron
rename to assets/common/items/armor/misc/pants/worker_blue.ron
diff --git a/assets/common/items/armor/shoulder/iron_spikes.ron b/assets/common/items/armor/misc/shoulder/iron_spikes.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/iron_spikes.ron
rename to assets/common/items/armor/misc/shoulder/iron_spikes.ron
diff --git a/assets/common/items/armor/shoulder/leather_0.ron b/assets/common/items/armor/misc/shoulder/leather_2.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_0.ron
rename to assets/common/items/armor/misc/shoulder/leather_2.ron
diff --git a/assets/common/items/armor/shoulder/leather_iron_0.ron b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_iron_0.ron
rename to assets/common/items/armor/misc/shoulder/leather_iron_0.ron
diff --git a/assets/common/items/armor/shoulder/leather_iron_1.ron b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_iron_1.ron
rename to assets/common/items/armor/misc/shoulder/leather_iron_1.ron
diff --git a/assets/common/items/armor/shoulder/leather_iron_2.ron b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_iron_2.ron
rename to assets/common/items/armor/misc/shoulder/leather_iron_2.ron
diff --git a/assets/common/items/armor/shoulder/leather_iron_3.ron b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_iron_3.ron
rename to assets/common/items/armor/misc/shoulder/leather_iron_3.ron
diff --git a/assets/common/items/armor/shoulder/leather_strips.ron b/assets/common/items/armor/misc/shoulder/leather_strip.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/leather_strips.ron
rename to assets/common/items/armor/misc/shoulder/leather_strip.ron
diff --git a/assets/common/items/armor/belt/plate_0.ron b/assets/common/items/armor/plate_green/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/plate_0.ron
rename to assets/common/items/armor/plate_green/belt.ron
diff --git a/assets/common/items/armor/chest/plate_green_0.ron b/assets/common/items/armor/plate_green/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/plate_green_0.ron
rename to assets/common/items/armor/plate_green/chest.ron
diff --git a/assets/common/items/armor/foot/plate_0.ron b/assets/common/items/armor/plate_green/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/plate_0.ron
rename to assets/common/items/armor/plate_green/foot.ron
diff --git a/assets/common/items/armor/hand/plate_0.ron b/assets/common/items/armor/plate_green/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/plate_0.ron
rename to assets/common/items/armor/plate_green/hand.ron
diff --git a/assets/common/items/armor/pants/plate_green_0.ron b/assets/common/items/armor/plate_green/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/plate_green_0.ron
rename to assets/common/items/armor/plate_green/pants.ron
diff --git a/assets/common/items/armor/shoulder/plate_0.ron b/assets/common/items/armor/plate_green/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/plate_0.ron
rename to assets/common/items/armor/plate_green/shoulder.ron
diff --git a/assets/common/items/armor/chest/rugged.ron b/assets/common/items/armor/rugged/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/rugged.ron
rename to assets/common/items/armor/rugged/chest.ron
diff --git a/assets/common/items/armor/pants/rugged.ron b/assets/common/items/armor/rugged/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/rugged.ron
rename to assets/common/items/armor/rugged/pants.ron
diff --git a/assets/common/items/armor/belt/steel_0.ron b/assets/common/items/armor/steel/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/steel_0.ron
rename to assets/common/items/armor/steel/belt.ron
diff --git a/assets/common/items/armor/chest/steel_0.ron b/assets/common/items/armor/steel/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/steel_0.ron
rename to assets/common/items/armor/steel/chest.ron
diff --git a/assets/common/items/armor/foot/steel_0.ron b/assets/common/items/armor/steel/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/steel_0.ron
rename to assets/common/items/armor/steel/foot.ron
diff --git a/assets/common/items/armor/hand/steel_0.ron b/assets/common/items/armor/steel/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/steel_0.ron
rename to assets/common/items/armor/steel/hand.ron
diff --git a/assets/common/items/armor/pants/steel_0.ron b/assets/common/items/armor/steel/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/steel_0.ron
rename to assets/common/items/armor/steel/pants.ron
diff --git a/assets/common/items/armor/shoulder/steel_0.ron b/assets/common/items/armor/steel/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/steel_0.ron
rename to assets/common/items/armor/steel/shoulder.ron
diff --git a/assets/common/items/armor/belt/tarasque.ron b/assets/common/items/armor/tarasque/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/tarasque.ron
rename to assets/common/items/armor/tarasque/belt.ron
diff --git a/assets/common/items/armor/chest/tarasque.ron b/assets/common/items/armor/tarasque/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/tarasque.ron
rename to assets/common/items/armor/tarasque/chest.ron
diff --git a/assets/common/items/armor/foot/tarasque.ron b/assets/common/items/armor/tarasque/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/tarasque.ron
rename to assets/common/items/armor/tarasque/foot.ron
diff --git a/assets/common/items/armor/hand/tarasque.ron b/assets/common/items/armor/tarasque/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/tarasque.ron
rename to assets/common/items/armor/tarasque/hand.ron
diff --git a/assets/common/items/armor/pants/tarasque.ron b/assets/common/items/armor/tarasque/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/tarasque.ron
rename to assets/common/items/armor/tarasque/pants.ron
diff --git a/assets/common/items/armor/shoulder/tarasque.ron b/assets/common/items/armor/tarasque/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/tarasque.ron
rename to assets/common/items/armor/tarasque/shoulder.ron
diff --git a/assets/common/items/armor/belt/twigsflowers.ron b/assets/common/items/armor/twigflowers/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/belt.ron
diff --git a/assets/common/items/armor/chest/twigsflowers.ron b/assets/common/items/armor/twigflowers/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/chest.ron
diff --git a/assets/common/items/armor/foot/twigsflowers.ron b/assets/common/items/armor/twigflowers/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/foot.ron
diff --git a/assets/common/items/armor/hand/twigsflowers.ron b/assets/common/items/armor/twigflowers/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/hand.ron
diff --git a/assets/common/items/armor/pants/twigsflowers.ron b/assets/common/items/armor/twigflowers/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/pants.ron
diff --git a/assets/common/items/armor/shoulder/twigsflowers.ron b/assets/common/items/armor/twigflowers/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/twigsflowers.ron
rename to assets/common/items/armor/twigflowers/shoulder.ron
diff --git a/assets/common/items/armor/belt/twig.ron b/assets/common/items/armor/twigs/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/twig.ron
rename to assets/common/items/armor/twigs/belt.ron
diff --git a/assets/common/items/armor/chest/twig.ron b/assets/common/items/armor/twigs/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/twig.ron
rename to assets/common/items/armor/twigs/chest.ron
diff --git a/assets/common/items/armor/foot/twig.ron b/assets/common/items/armor/twigs/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/twig.ron
rename to assets/common/items/armor/twigs/foot.ron
diff --git a/assets/common/items/armor/hand/twig.ron b/assets/common/items/armor/twigs/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/twig.ron
rename to assets/common/items/armor/twigs/hand.ron
diff --git a/assets/common/items/armor/pants/twig.ron b/assets/common/items/armor/twigs/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/twig.ron
rename to assets/common/items/armor/twigs/pants.ron
diff --git a/assets/common/items/armor/shoulder/twigs.ron b/assets/common/items/armor/twigs/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/twigs.ron
rename to assets/common/items/armor/twigs/shoulder.ron
diff --git a/assets/common/items/armor/belt/twigsleaves.ron b/assets/common/items/armor/twigsleaves/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/belt.ron
diff --git a/assets/common/items/armor/chest/twigsleaves.ron b/assets/common/items/armor/twigsleaves/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/chest.ron
diff --git a/assets/common/items/armor/foot/twigsleaves.ron b/assets/common/items/armor/twigsleaves/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/foot.ron
diff --git a/assets/common/items/armor/hand/twigsleaves.ron b/assets/common/items/armor/twigsleaves/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/hand.ron
diff --git a/assets/common/items/armor/pants/twigsleaves.ron b/assets/common/items/armor/twigsleaves/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/pants.ron
diff --git a/assets/common/items/armor/shoulder/twigsleaves.ron b/assets/common/items/armor/twigsleaves/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/twigsleaves.ron
rename to assets/common/items/armor/twigsleaves/shoulder.ron
diff --git a/assets/common/items/armor/back/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/back.ron
similarity index 100%
rename from assets/common/items/armor/back/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/back.ron
diff --git a/assets/common/items/armor/belt/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/belt.ron
diff --git a/assets/common/items/armor/chest/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/chest.ron
diff --git a/assets/common/items/armor/foot/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/foot.ron
diff --git a/assets/common/items/armor/hand/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/hand.ron
diff --git a/assets/common/items/armor/pants/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/pants.ron
diff --git a/assets/common/items/armor/shoulder/velorite_mage_0.ron b/assets/common/items/armor/velorite_mage/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/velorite_mage_0.ron
rename to assets/common/items/armor/velorite_mage/shoulder.ron
diff --git a/assets/common/items/armor/back/warlock.ron b/assets/common/items/armor/warlock/back.ron
similarity index 100%
rename from assets/common/items/armor/back/warlock.ron
rename to assets/common/items/armor/warlock/back.ron
diff --git a/assets/common/items/armor/belt/warlock.ron b/assets/common/items/armor/warlock/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/warlock.ron
rename to assets/common/items/armor/warlock/belt.ron
diff --git a/assets/common/items/armor/chest/warlock.ron b/assets/common/items/armor/warlock/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/warlock.ron
rename to assets/common/items/armor/warlock/chest.ron
diff --git a/assets/common/items/armor/foot/warlock.ron b/assets/common/items/armor/warlock/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/warlock.ron
rename to assets/common/items/armor/warlock/foot.ron
diff --git a/assets/common/items/armor/hand/warlock.ron b/assets/common/items/armor/warlock/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/warlock.ron
rename to assets/common/items/armor/warlock/hand.ron
diff --git a/assets/common/items/armor/head/warlock.ron b/assets/common/items/armor/warlock/head.ron
similarity index 100%
rename from assets/common/items/armor/head/warlock.ron
rename to assets/common/items/armor/warlock/head.ron
diff --git a/assets/common/items/armor/pants/warlock.ron b/assets/common/items/armor/warlock/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/warlock.ron
rename to assets/common/items/armor/warlock/pants.ron
diff --git a/assets/common/items/armor/shoulder/warlock.ron b/assets/common/items/armor/warlock/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/warlock.ron
rename to assets/common/items/armor/warlock/shoulder.ron
diff --git a/assets/common/items/armor/back/warlord.ron b/assets/common/items/armor/warlord/back.ron
similarity index 100%
rename from assets/common/items/armor/back/warlord.ron
rename to assets/common/items/armor/warlord/back.ron
diff --git a/assets/common/items/armor/belt/warlord.ron b/assets/common/items/armor/warlord/belt.ron
similarity index 100%
rename from assets/common/items/armor/belt/warlord.ron
rename to assets/common/items/armor/warlord/belt.ron
diff --git a/assets/common/items/armor/chest/warlord.ron b/assets/common/items/armor/warlord/chest.ron
similarity index 100%
rename from assets/common/items/armor/chest/warlord.ron
rename to assets/common/items/armor/warlord/chest.ron
diff --git a/assets/common/items/armor/foot/warlord.ron b/assets/common/items/armor/warlord/foot.ron
similarity index 100%
rename from assets/common/items/armor/foot/warlord.ron
rename to assets/common/items/armor/warlord/foot.ron
diff --git a/assets/common/items/armor/hand/warlord.ron b/assets/common/items/armor/warlord/hand.ron
similarity index 100%
rename from assets/common/items/armor/hand/warlord.ron
rename to assets/common/items/armor/warlord/hand.ron
diff --git a/assets/common/items/armor/head/warlord.ron b/assets/common/items/armor/warlord/head.ron
similarity index 100%
rename from assets/common/items/armor/head/warlord.ron
rename to assets/common/items/armor/warlord/head.ron
diff --git a/assets/common/items/armor/pants/warlord.ron b/assets/common/items/armor/warlord/pants.ron
similarity index 100%
rename from assets/common/items/armor/pants/warlord.ron
rename to assets/common/items/armor/warlord/pants.ron
diff --git a/assets/common/items/armor/shoulder/warlord.ron b/assets/common/items/armor/warlord/shoulder.ron
similarity index 100%
rename from assets/common/items/armor/shoulder/warlord.ron
rename to assets/common/items/armor/warlord/shoulder.ron