diff --git a/game-server/datapacks/original/data/items/armour/backpack/backpack_advanced.json b/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_advanced.json
similarity index 100%
rename from game-server/datapacks/original/data/items/armour/backpack/backpack_advanced.json
rename to game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_advanced.json
diff --git a/game-server/datapacks/original/data/items/armour/backpack/backpack_basic.json b/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_basic.json
similarity index 100%
rename from game-server/datapacks/original/data/items/armour/backpack/backpack_basic.json
rename to game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_basic.json
diff --git a/game-server/datapacks/original/data/items/armour/backpack/backpack_elite.json b/game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_elite.json
similarity index 100%
rename from game-server/datapacks/original/data/items/armour/backpack/backpack_elite.json
rename to game-server/datapacks/original/data/items/equipment/personal/armour/backpack/backpack_elite.json
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/armour/gloves/basic_glioves.json
new file mode 100644
index 0000000..1e77422
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/personal/armour/gloves/basic_glioves.json
@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_ship_plating",
+    "displayName": "items.materials.original.gloves.basic_gloves",
+    "description": "items.materials.original.gloves.basic_gloves.desc",
+    "texture": "original/assets/textures/equipment/personal/armor/gloves/basic_gloves.png",
+    "stats": {
+      "health": 5,
+      "resistance.base": 0.1,
+      "defence.rating": 1.3,
+      "reflect.chance": 0.1
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_gloves",
+      "storeCategory": "original:personal",
+      "dungeon": "ground"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/data/items/equipment/ship/engines/basic_ship_engines.json b/game-server/datapacks/original/data/items/equipment/ship/engines/basic_ship_engines.json
new file mode 100644
index 0000000..9566bc5
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/ship/engines/basic_ship_engines.json
@@ -0,0 +1,17 @@
+{
+  "plating": {
+    "id": "original:basic_ship_enignes",
+    "displayName": "items.materials.original.engine..basic_ship_enignes",
+    "description": "items.materials.original.plating.basic_ship_enignes.desc",
+    "texture": "original/assets/textures/equipement/ship/engines/basic_ship_enignes.png",
+    "stats": {
+      "health": 50
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:ship_engines",
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/data/items/hullPlating/ship/basic_ship_plating.json b/game-server/datapacks/original/data/items/equipment/ship/hulls/basic_ship_plating.json
similarity index 52%
rename from game-server/datapacks/original/data/items/hullPlating/ship/basic_ship_plating.json
rename to game-server/datapacks/original/data/items/equipment/ship/hulls/basic_ship_plating.json
index b5206ab..6d9fb48 100644
--- a/game-server/datapacks/original/data/items/hullPlating/ship/basic_ship_plating.json
+++ b/game-server/datapacks/original/data/items/equipment/ship/hulls/basic_ship_plating.json
@@ -3,17 +3,18 @@
     "id": "original:basic_ship_plating",
     "displayName": "items.materials.original.plating.basic_ship_plating",
     "description": "items.materials.original.plating.basic_ship_plating.desc",
-    "texture": "original/assets/textures/hullPlating/ship/plating/basic_ship_plating.png",
+    "texture": "original/assets/textures/equipement/ship/hulls/basic_ship_plating.png",
     "stats": {
-      "health": 50,
-      "resistance.base": 0.6,
+      "health": 10,
+      "resistance.base": 0.1,
       "defence.rating": 2.3,
-      "reflect.chance": 5.3
+      "reflect.chance": 1.3
     },
     "meta": {
       "rarity": "common",
-      "equipmentSlot": "original:shipHull",
-      "storeCategory": "original:shipHull"
+      "equipmentSlot": "original:ship_hull",
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
     }
   }
 }
diff --git a/game-server/datapacks/original/data/items/equipment/ship/shields/basic_ship_shield.json b/game-server/datapacks/original/data/items/equipment/ship/shields/basic_ship_shield.json
new file mode 100644
index 0000000..d2292b7
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/ship/shields/basic_ship_shield.json
@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_ship_shield",
+    "displayName": "items.materials.original.plating.basic_ship_shield",
+    "description": "items.materials.original.plating.basic_ship_shield.desc",
+    "texture": "original/assets/textures/equipement/ship/hulls/basic_ship_plating.png",
+    "stats": {
+      "health": 25,
+      "resistance.base": 0.75,
+      "defence.rating": 5.25,
+      "reflect.chance": 7.25
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:ship_shields",
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/data/items/equipment/ship/thrusters/basic_ship_thrusters.json b/game-server/datapacks/original/data/items/equipment/ship/thrusters/basic_ship_thrusters.json
new file mode 100644
index 0000000..6c65d21
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/ship/thrusters/basic_ship_thrusters.json
@@ -0,0 +1,24 @@
+{
+  "plating": {
+    "id": "original:basic_ship_thruster",
+    "displayName": "items.materials.original.thruster.basic_ship_thruster",
+    "description": "items.materials.original.thruster.basic_ship_thruster.desc",
+    "texture": "original/assets/textures/equipement/ship/thrusters/basic_ship_thruster.png",
+    "stats": {
+      "health": 15,
+      "defence.rating": 0.125,
+      "speed": 12.5
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": [
+        "original:ship_thruster_1",
+        "original:ship_thruster_2",
+        "original:ship_thruster_3",
+        "original:ship_thruster_4"
+      ],
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/data/items/equipment/ship/weapons/basic_ship_weapon.json b/game-server/datapacks/original/data/items/equipment/ship/weapons/basic_ship_weapon.json
new file mode 100644
index 0000000..59a9e52
--- /dev/null
+++ b/game-server/datapacks/original/data/items/equipment/ship/weapons/basic_ship_weapon.json
@@ -0,0 +1,22 @@
+{
+  "plating": {
+    "id": "original:basic_ship_weapon",
+    "displayName": "items.materials.original.plating.basic_ship_weapon",
+    "description": "items.materials.original.plating.basic_ship_weapon.desc",
+    "texture": "original/assets/textures/equipement/ship/weapon/basic_ship_weapon.png",
+    "stats": {
+      "attack": 7.5,
+      "health": 5,
+      "defence.rating": 0.1
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": [
+        "original:ship_weapon_1",
+        "original:ship_weapon_2"
+      ],
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
+    }
+  }
+}
diff --git a/game-server/datapacks/original/manifest.json b/game-server/datapacks/original/manifest.json
index d1994cc..afb7ce8 100644
--- a/game-server/datapacks/original/manifest.json
+++ b/game-server/datapacks/original/manifest.json
@@ -190,11 +190,11 @@
       "original:ships": {
         "displayName": "shop.category.original.ships"
       },
-      "original:weapons": {
-        "displayName": "shop.category.original.weapons"
+      "original:personal_equipment": {
+        "displayName": "shop.category.original.personal.equipment"
       },
-      "original:defence": {
-        "displayName": "shop.category.original.defence"
+      "original:ship_equipment": {
+        "displayName": "shop.category.original.ship.equipment"
       },
       "original:consumables": {
         "displayName": "shop.category.original.consumables"