diff --git a/game-server/datapacks/original/data/items/equipment/personal/accessory/basic_accessory.json b/game-server/datapacks/original/data/items/equipment/personal/accessory/basic_accessory.json
new file mode 100644
index 0000000..32da85f
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/personal/accessory/basic_accessory.json
@@ -0,0 +1,22 @@
+{
+  "plating": {
+    "id": "original:basic_personal_accessory",
+    "displayName": "items.materials.original.accessory.basic_personal_accessory",
+    "description": "items.materials.original.accessory.basic_personal_accessory.desc",
+    "texture": "original/assets/textures/equipement/personal/accessory/basic_accessory.png",
+    "stats": {
+      "health": 2.25
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": [
+        "original:personal_accessory_1",
+        "original:personal_accessory_2",
+        "original:personal_accessory_3",
+        "original:personal_accessory_4"
+      ],
+      "storeCategory": "original:personal_equipment",
+      "dungeon": "ground"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_advanced.json b/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_advanced.json
deleted file mode 100644
index a4907d4..0000000
--- a/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_advanced.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "armour": {
-    "id": "original:backpack_advanced",
-    "displayName": "items.materials.original.backpack_advanced",
-    "description": "items.materials.original.backpack_advanced.desc",
-    "texture": "original/assets/armour/backpack/backpack_advanced.png",
-    "stats": {
-      "health": 30,
-      "resistance.base": 0.6,
-      "defence.rating": 0.5,
-      "reflect.chance": 0.7
-    },
-    "meta": {
-      "rarity": "common",
-      "equipmentSlot": "original:accessory",
-      "storeCategory": "original:bag"
-    }
-  }
-}
diff --git a/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_basic.json b/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_basic.json
deleted file mode 100644
index b77ef64..0000000
--- a/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_basic.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "armour": {
-    "id": "original:backpack_basic",
-    "displayName": "items.materials.original.backpack_basic",
-    "description": "items.materials.original.backpack_basic.desc",
-    "texture": "original/assets/armour/backpack/backpack_basic.png",
-    "stats": {
-      "health": 50,
-      "resistance.base": 0.6,
-      "defence.rating": 0.5,
-      "reflect.chance": 0.7
-    },
-    "meta": {
-      "rarity": "common",
-      "equipmentSlot": "original:accessory",
-      "storeCategory": "original:bag"
-    }
-  }
-}
diff --git a/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_elite.json b/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_elite.json
deleted file mode 100644
index 3795ba5..0000000
--- a/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_elite.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "armour": {
-    "id": "original:backpack_elite",
-    "displayName": "items.materials.original.backpack_elite",
-    "description": "items.materials.original.backpack_elite.desc",
-    "texture": "original/assets/armour/backpack/backpack_elite.png",
-    "stats": {
-      "health": 30,
-      "resistance.base": 0.6,
-      "defence.rating": 0.5,
-      "reflect.chance": 0.7
-    },
-    "meta": {
-      "rarity": "uncommon",
-      "equipmentSlot": "original:accessory",
-      "storeCategory": "original:bag"
-    }
-  }
-}
diff --git a/game-server/datapacks/original/data/items/equipment/personal/backpack/backpack_basic.json b/game-server/datapacks/original/data/items/equipment/personal/backpack/backpack_basic.json
new file mode 100644
index 0000000..2bfe11b
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/personal/backpack/backpack_basic.json
@@ -0,0 +1,19 @@
+{
+  "armour": {
+    "id": "original:backpack_personal_basic",
+    "displayName": "items.materials.original.backpack.backpack_personal_basic",
+    "description": "items.materials.original.backpack.backpack_personal_basic.desc",
+    "texture": "original/assets/textures/equipement/personal/backpacks/backpack_basic.png",
+    "stats": {
+      "health": 20,
+      "resistance.base": 0.125,
+      "defence.rating": 0.125
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_backpack",
+      "storeCategory": "original:personal_equipment",
+      "dungeon": "ground"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/data/items/equipment/personal/boots/basic_boots.json b/game-server/datapacks/original/data/items/equipment/personal/boots/basic_boots.json
new file mode 100644
index 0000000..c24a15e
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/personal/boots/basic_boots.json
@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_personal_boots",
+    "displayName": "items.materials.original.boots.basic_personal_boots",
+    "description": "items.materials.original.boots.basic_personal_boots.desc",
+    "texture": "original/assets/textures/equipment/personal/boots/basic_boots.png",
+    "stats": {
+      "health": 5,
+      "resistance.base": 0.1,
+      "defence.rating": 1.3,
+      "reflect.chance": 0.1
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_boots",
+      "storeCategory": "original:personal",
+      "dungeon": "ground"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/data/items/equipment/personal/armour/gloves/basic_glioves.json b/game-server/datapacks/original/data/items/equipment/personal/gloves/basic_gloves.json
similarity index 67%
rename from game-server/datapacks/original/data/items/equipment/personal/armour/gloves/basic_glioves.json
rename to game-server/datapacks/original/data/items/equipment/personal/gloves/basic_gloves.json
index 1e77422..93bd638 100644
--- a/game-server/datapacks/original/data/items/equipment/personal/armour/gloves/basic_glioves.json
+++ b/game-server/datapacks/original/data/items/equipment/personal/gloves/basic_gloves.json
@@ -1,8 +1,8 @@
 {
   "plating": {
-    "id": "original:basic_ship_plating",
-    "displayName": "items.materials.original.gloves.basic_gloves",
-    "description": "items.materials.original.gloves.basic_gloves.desc",
+    "id": "original:basic_personal_gloves",
+    "displayName": "items.materials.original.gloves.basic_personal_gloves",
+    "description": "items.materials.original.gloves.basic_personal_gloves.desc",
     "texture": "original/assets/textures/equipment/personal/armor/gloves/basic_gloves.png",
     "stats": {
       "health": 5,
diff --git a/game-server/datapacks/original/data/items/equipment/personal/suit/basic_suit.json b/game-server/datapacks/original/data/items/equipment/personal/suit/basic_suit.json
new file mode 100644
index 0000000..645b1fd
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/personal/suit/basic_suit.json
@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_personal_suit",
+    "displayName": "items.materials.original.suit.basic_personal_suit",
+    "description": "items.materials.original.suit.basic_personal_suit.desc",
+    "texture": "original/assets/textures/equipment/personal/suit/basic_suit.png",
+    "stats": {
+      "health": 15,
+      "resistance.base": 0.125,
+      "defence.rating": 0.9,
+      "reflect.chance": 0.0125
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_suit",
+      "storeCategory": "original:personal",
+      "dungeon": "ground"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/data/items/equipment/personal/weapns/basic_weapon.json b/game-server/datapacks/original/data/items/equipment/personal/weapns/basic_weapon.json
new file mode 100644
index 0000000..463f10d
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/personal/weapns/basic_weapon.json
@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_personal_weapon",
+    "displayName": "items.materials.original.weapon.basic_personal_weapon",
+    "description": "items.materials.original.weapon.basic_personal_weapon.desc",
+    "texture": "original/assets/textures/equipment/personal/weapon/basic_weapon.png",
+    "stats": {
+      "health": 15,
+      "resistance.base": 0.125,
+      "defence.rating": 0.9,
+      "reflect.chance": 0.0125
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_suit",
+      "storeCategory": "original:personal",
+      "dungeon": "ground"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/manifest.json b/game-server/datapacks/original/manifest.json
index afb7ce8..767d9cc 100644
--- a/game-server/datapacks/original/manifest.json
+++ b/game-server/datapacks/original/manifest.json
@@ -98,31 +98,34 @@
   },
   "core_systems": {
     "categories": {
-      "original:person_helmet": {
+      "original:personal_helmet": {
         "displayName": "core_systems.category.original.person.helmet"
       },
-      "original:person_suit": {
+      "original:personal_suit": {
         "displayName": "core_systems.category.original.person.suit"
       },
-      "original:person_gloves": {
+      "original:personal_gloves": {
         "displayName": "core_systems.category.original.person.gloves"
       },
-      "original:person_boots": {
+      "original:personal_backpack": {
+        "displayName": "core_systems.category.original.person.backpack"
+      },
+      "original:personal_boots": {
         "displayName": "core_systems.category.original.person.boots"
       },
-      "original:person_accessory_1": {
+      "original:personal_accessory_1": {
         "displayName": "core_systems.category.original.person.accessory_1"
       },
-      "original:person_accessory_2": {
+      "original:personal_accessory_2": {
         "displayName": "core_systems.category.original.person.accessory_2"
       },
-      "original:person_accessory_3": {
+      "original:personal_accessory_3": {
         "displayName": "core_systems.category.original.person.accessory_3"
       },
-      "original:person_accessory_4": {
+      "original:personal_accessory_4": {
         "displayName": "core_systems.category.original.person.accessory_4"
       },
-      "original:person_weapons": {
+      "original:personal_weapons": {
         "displayName": "core_systems.category.original.person.weapon"
       },
       "original:ship_hull": {