diff --git a/src/main/resources/assets/extendedae_plus/models/item/basic_core.json b/src/main/resources/assets/extendedae_plus/models/item/basic_core.json
index 5b74a92..6bfdc4f 100644
--- a/src/main/resources/assets/extendedae_plus/models/item/basic_core.json
+++ b/src/main/resources/assets/extendedae_plus/models/item/basic_core.json
@@ -1,4 +1,25 @@
 {
   "parent": "item/generated",
-  "textures": { "layer0": "extendedae_plus:item/basic_core" }
+  "textures": {
+    "layer0": "extendedae_plus:item/core/basic_core"
+  },
+  "overrides": [
+
+    {
+      "predicate": { "custom_model_data": 1 },
+      "model": "extendedae_plus:item/core/basic_core_storage"
+    },
+    {
+      "predicate": { "custom_model_data": 2 },
+      "model": "extendedae_plus:item/core/basic_core_spatial"
+    },
+    {
+      "predicate": { "custom_model_data": 3 },
+      "model": "extendedae_plus:item/core/basic_core_energy"
+    },
+    {
+      "predicate": { "custom_model_data": 4 },
+      "model": "extendedae_plus:item/core/basic_core_quantum"
+    }
+  ]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_energy.json b/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_energy.json
new file mode 100644
index 0000000..3392036
--- /dev/null
+++ b/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_energy.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "extendedae_plus:item/core/basic_core_energy"
+  }
+}
diff --git a/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_quantum.json b/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_quantum.json
new file mode 100644
index 0000000..ff7dbf3
--- /dev/null
+++ b/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_quantum.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "extendedae_plus:item/core/basic_core_quantum"
+  }
+}
diff --git a/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_spatial.json b/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_spatial.json
new file mode 100644
index 0000000..3db2c96
--- /dev/null
+++ b/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_spatial.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "extendedae_plus:item/core/basic_core_spatial"
+  }
+}
diff --git a/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_storage.json b/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_storage.json
new file mode 100644
index 0000000..4f5ced8
--- /dev/null
+++ b/src/main/resources/assets/extendedae_plus/models/item/core/basic_core_storage.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "extendedae_plus:item/core/basic_core_storage"
+  }
+}
diff --git a/src/main/resources/assets/extendedae_plus/models/item/energy_storage_core.json b/src/main/resources/assets/extendedae_plus/models/item/energy_storage_core.json
index ca84dae..2f34e57 100644
--- a/src/main/resources/assets/extendedae_plus/models/item/energy_storage_core.json
+++ b/src/main/resources/assets/extendedae_plus/models/item/energy_storage_core.json
@@ -1,4 +1,4 @@
 {
   "parent": "item/generated",
-  "textures": { "layer0": "extendedae_plus:item/energy_storage_core" }
+  "textures": { "layer0": "extendedae_plus:item/core/energy_storage_core" }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/extendedae_plus/models/item/infinity_core.json b/src/main/resources/assets/extendedae_plus/models/item/infinity_core.json
index 8e6313e..1aa66dc 100644
--- a/src/main/resources/assets/extendedae_plus/models/item/infinity_core.json
+++ b/src/main/resources/assets/extendedae_plus/models/item/infinity_core.json
@@ -1,4 +1,4 @@
 {
   "parent": "item/generated",
-  "textures": { "layer0": "extendedae_plus:item/infinity_core" }
+  "textures": { "layer0": "extendedae_plus:item/core/infinity_core" }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/extendedae_plus/models/item/quantum_storage_core.json b/src/main/resources/assets/extendedae_plus/models/item/quantum_storage_core.json
index d296256..929f5ca 100644
--- a/src/main/resources/assets/extendedae_plus/models/item/quantum_storage_core.json
+++ b/src/main/resources/assets/extendedae_plus/models/item/quantum_storage_core.json
@@ -1,4 +1,4 @@
 {
   "parent": "item/generated",
-  "textures": { "layer0": "extendedae_plus:item/quantum_storage_core" }
+  "textures": { "layer0": "extendedae_plus:item/core/quantum_storage_core" }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/extendedae_plus/models/item/spatial_core.json b/src/main/resources/assets/extendedae_plus/models/item/spatial_core.json
index 9fd37c2..ce05cc2 100644
--- a/src/main/resources/assets/extendedae_plus/models/item/spatial_core.json
+++ b/src/main/resources/assets/extendedae_plus/models/item/spatial_core.json
@@ -1,4 +1,4 @@
 {
   "parent": "item/generated",
-  "textures": { "layer0": "extendedae_plus:item/spatial_core" }
+  "textures": { "layer0": "extendedae_plus:item/core/spatial_core" }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/extendedae_plus/models/item/storage_core.json b/src/main/resources/assets/extendedae_plus/models/item/storage_core.json
index e4bf815..9dcb6ed 100644
--- a/src/main/resources/assets/extendedae_plus/models/item/storage_core.json
+++ b/src/main/resources/assets/extendedae_plus/models/item/storage_core.json
@@ -1,4 +1,4 @@
 {
   "parent": "item/generated",
-  "textures": { "layer0": "extendedae_plus:item/storage_core" }
+  "textures": { "layer0": "extendedae_plus:item/core/storage_core" }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/basic_core.png b/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core.png
similarity index 100%
rename from src/main/resources/assets/extendedae_plus/textures/item/basic_core.png
rename to src/main/resources/assets/extendedae_plus/textures/item/core/basic_core.png
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_energy.png b/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_energy.png
new file mode 100644
index 0000000..e1b24d1
Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_energy.png differ
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_quantum.png b/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_quantum.png
new file mode 100644
index 0000000..7883ffd
Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_quantum.png differ
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_spatial.png b/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_spatial.png
new file mode 100644
index 0000000..7c1e5c2
Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_spatial.png differ
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_storage.png b/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_storage.png
new file mode 100644
index 0000000..7e69709
Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/item/core/basic_core_storage.png differ
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png b/src/main/resources/assets/extendedae_plus/textures/item/core/energy_storage_core.png
similarity index 52%
rename from src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png
rename to src/main/resources/assets/extendedae_plus/textures/item/core/energy_storage_core.png
index a32e5d1..2513f8e 100644
Binary files a/src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png and b/src/main/resources/assets/extendedae_plus/textures/item/core/energy_storage_core.png differ
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png.mcmeta b/src/main/resources/assets/extendedae_plus/textures/item/core/energy_storage_core.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/extendedae_plus/textures/item/energy_storage_core.png.mcmeta
rename to src/main/resources/assets/extendedae_plus/textures/item/core/energy_storage_core.png.mcmeta
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/infinity_core.png b/src/main/resources/assets/extendedae_plus/textures/item/core/infinity_core.png
similarity index 100%
rename from src/main/resources/assets/extendedae_plus/textures/item/infinity_core.png
rename to src/main/resources/assets/extendedae_plus/textures/item/core/infinity_core.png
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png b/src/main/resources/assets/extendedae_plus/textures/item/core/quantum_storage_core.png
similarity index 54%
rename from src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png
rename to src/main/resources/assets/extendedae_plus/textures/item/core/quantum_storage_core.png
index 6b63b83..6fc8508 100644
Binary files a/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png and b/src/main/resources/assets/extendedae_plus/textures/item/core/quantum_storage_core.png differ
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png.mcmeta b/src/main/resources/assets/extendedae_plus/textures/item/core/quantum_storage_core.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/extendedae_plus/textures/item/quantum_storage_core.png.mcmeta
rename to src/main/resources/assets/extendedae_plus/textures/item/core/quantum_storage_core.png.mcmeta
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/spatial_core.png b/src/main/resources/assets/extendedae_plus/textures/item/core/spatial_core.png
similarity index 100%
rename from src/main/resources/assets/extendedae_plus/textures/item/spatial_core.png
rename to src/main/resources/assets/extendedae_plus/textures/item/core/spatial_core.png
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/storage_core.png b/src/main/resources/assets/extendedae_plus/textures/item/core/storage_core.png
similarity index 53%
rename from src/main/resources/assets/extendedae_plus/textures/item/storage_core.png
rename to src/main/resources/assets/extendedae_plus/textures/item/core/storage_core.png
index 0b885c0..8602e1e 100644
Binary files a/src/main/resources/assets/extendedae_plus/textures/item/storage_core.png and b/src/main/resources/assets/extendedae_plus/textures/item/core/storage_core.png differ
diff --git a/src/main/resources/assets/extendedae_plus/textures/item/storage_core.png.mcmeta b/src/main/resources/assets/extendedae_plus/textures/item/core/storage_core.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/extendedae_plus/textures/item/storage_core.png.mcmeta
rename to src/main/resources/assets/extendedae_plus/textures/item/core/storage_core.png.mcmeta
diff --git a/src/main/resources/data/extendedae_plus/recipes/storage_core.json b/src/main/resources/data/extendedae_plus/recipes/storage_core.json
deleted file mode 100644
index 83159b5..0000000
--- a/src/main/resources/data/extendedae_plus/recipes/storage_core.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "SBS",
-    "QXQ",
-    "SBS"
-  ],
-  "key": {
-    "S": {
-      "item": "ae2:speed_card"
-    },
-    "B": {
-      "item": "extendedae_plus:64x_crafting_accelerator"
-    },
-    "Q": {
-      "item": "ae2:spatial_cell_component_2"
-    },
-    "X": {
-      "item": "ae2:cell_component_256k"
-    }
-  },
-  "result": {
-    "item": "extendedae_plus:1024x_crafting_accelerator",
-    "count": 1
-  }
-}
\ No newline at end of file