diff --git a/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java b/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java
index 4520575d..8a56ff8e 100644
--- a/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java
+++ b/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java
@@ -27,9 +27,9 @@ import net.minecraft.util.text.Style;
 import java.util.List;
 
 public final class ComputerTileEntityRenderer extends TileEntityRenderer<ComputerTileEntity> {
-    public static final ResourceLocation OVERLAY_POWER_LOCATION = new ResourceLocation(API.MOD_ID, "blocks/computer/computer_overlay_power");
-    public static final ResourceLocation OVERLAY_STATUS_LOCATION = new ResourceLocation(API.MOD_ID, "blocks/computer/computer_overlay_status");
-    public static final ResourceLocation OVERLAY_TERMINAL_LOCATION = new ResourceLocation(API.MOD_ID, "blocks/computer/computer_overlay_terminal");
+    public static final ResourceLocation OVERLAY_POWER_LOCATION = new ResourceLocation(API.MOD_ID, "block/computer/computer_overlay_power");
+    public static final ResourceLocation OVERLAY_STATUS_LOCATION = new ResourceLocation(API.MOD_ID, "block/computer/computer_overlay_status");
+    public static final ResourceLocation OVERLAY_TERMINAL_LOCATION = new ResourceLocation(API.MOD_ID, "block/computer/computer_overlay_terminal");
 
     private static final RenderMaterial TEXTURE_POWER = new RenderMaterial(PlayerContainer.LOCATION_BLOCKS_TEXTURE, OVERLAY_POWER_LOCATION);
     private static final RenderMaterial TEXTURE_STATUS = new RenderMaterial(PlayerContainer.LOCATION_BLOCKS_TEXTURE, OVERLAY_STATUS_LOCATION);
diff --git a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java
index 03dae8a3..b5bdc564 100644
--- a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java
+++ b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java
@@ -19,34 +19,34 @@ public final class ModItemModelProvider extends ItemModelProvider {
 
     @Override
     protected void registerModels() {
-        simple(Items.WRENCH_ITEM, "items/wrench");
+        simple(Items.WRENCH_ITEM, "item/wrench");
 
-        simple(Items.NETWORK_CABLE_ITEM, "items/network_cable");
+        simple(Items.NETWORK_CABLE_ITEM, "item/network_cable");
 
-        simple(Items.MEMORY_ITEM, "items/memory1")
+        simple(Items.MEMORY_ITEM, "item/memory1")
                 .override()
                 .predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 4 * Constants.MEGABYTE)
-                .model(simple(Items.MEMORY_ITEM, "items/memory2", "2"))
+                .model(simple(Items.MEMORY_ITEM, "item/memory2", "2"))
                 .end()
                 .override()
                 .predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 8 * Constants.MEGABYTE)
-                .model(simple(Items.MEMORY_ITEM, "items/memory3", "3"))
+                .model(simple(Items.MEMORY_ITEM, "item/memory3", "3"))
                 .end();
-        simple(Items.HARD_DRIVE_ITEM, "items/hard_drive1")
+        simple(Items.HARD_DRIVE_ITEM, "item/hard_drive1")
                 .override()
                 .predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 4 * Constants.MEGABYTE)
-                .model(simple(Items.HARD_DRIVE_ITEM, "items/hard_drive2", "2"))
+                .model(simple(Items.HARD_DRIVE_ITEM, "item/hard_drive2", "2"))
                 .end()
                 .override()
                 .predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 8 * Constants.MEGABYTE)
-                .model(simple(Items.HARD_DRIVE_ITEM, "items/hard_drive3", "3"))
+                .model(simple(Items.HARD_DRIVE_ITEM, "item/hard_drive3", "3"))
                 .end();
-        simple(Items.FLASH_MEMORY_ITEM, "items/flash_memory");
-        simple(Items.REDSTONE_INTERFACE_CARD_ITEM, "items/redstone_interface_card");
-        simple(Items.NETWORK_INTERFACE_CARD_ITEM, "items/network_interface_card");
+        simple(Items.FLASH_MEMORY_ITEM, "item/flash_memory");
+        simple(Items.REDSTONE_INTERFACE_CARD_ITEM, "item/redstone_interface_card");
+        simple(Items.NETWORK_INTERFACE_CARD_ITEM, "item/network_interface_card");
 
-        simple(Items.INVENTORY_OPERATIONS_MODULE, "items/inventory_operations_module");
-        simple(Items.BLOCK_OPERATIONS_MODULE, "items/block_operations_module");
+        simple(Items.INVENTORY_OPERATIONS_MODULE, "item/inventory_operations_module");
+        simple(Items.BLOCK_OPERATIONS_MODULE, "item/block_operations_module");
 
         withExistingParent(Constants.ROBOT_ENTITY_NAME, "template_shulker_box");
     }
diff --git a/src/main/resources/assets/oc2/models/block/cable_base.json b/src/main/resources/assets/oc2/models/block/cable_base.json
index ca7d46e8..6f7bec4b 100644
--- a/src/main/resources/assets/oc2/models/block/cable_base.json
+++ b/src/main/resources/assets/oc2/models/block/cable_base.json
@@ -1 +1 @@
-{"parent":"block/block","loader":"oc2:bus_cable","textures":{"east":"oc2:blocks/cable_base/cable_base_east","west":"oc2:blocks/cable_base/cable_base_west","down":"oc2:blocks/cable_base/cable_base_down","north":"oc2:blocks/cable_base/cable_base_north","south":"oc2:blocks/cable_base/cable_base_south","up":"oc2:blocks/cable_base/cable_base_up","particle":"#north"},"elements":[{"from":[6,5,6],"to":[10,6,10],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[6,6,10],"to":[10,10,11],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south"}}},{"from":[5,6,6],"to":[11,10,10],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[6,6,5],"to":[10,10,6],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"}}},{"from":[6,10,6],"to":[10,11,10],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"north":{"texture":"north"},"south":{"texture":"south"}}}]}
\ No newline at end of file
+{"parent":"block/block","textures":{"atlas0":"oc2:block/cable_base/cable_base_atlas0","particle":"#north"},"elements":[{"from":[6,5,6],"to":[10,6,10],"faces":{"east":{"texture":"atlas0","uv":[0.0,8.0,2.0,8.5]},"west":{"texture":"atlas0","uv":[0.0,8.5,2.0,9.0]},"down":{"texture":"atlas0","uv":[0.0,9.0,2.0,11.0]},"north":{"texture":"atlas0","uv":[0.0,11.0,2.0,11.5]},"south":{"texture":"atlas0","uv":[0.0,11.5,2.0,12.0]}}},{"from":[6,6,10],"to":[10,10,11],"faces":{"east":{"texture":"atlas0","uv":[3.0,0.0,3.5,2.0]},"west":{"texture":"atlas0","uv":[3.5,0.0,4.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,2.0,12.5]},"down":{"texture":"atlas0","uv":[0.0,12.5,2.0,13.0]},"south":{"texture":"atlas0","uv":[0.0,13.0,2.0,15.0]}}},{"from":[5,6,6],"to":[11,10,10],"faces":{"east":{"texture":"atlas0","uv":[2.0,13.0,4.0,15.0]},"west":{"texture":"atlas0","uv":[4.0,13.0,6.0,15.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,3.0,2.0]},"down":{"texture":"atlas0","uv":[0.0,2.0,3.0,4.0]},"north":{"texture":"atlas0","uv":[0.0,4.0,3.0,6.0]},"south":{"texture":"atlas0","uv":[0.0,6.0,3.0,8.0]}}},{"from":[6,6,5],"to":[10,10,6],"faces":{"east":{"texture":"atlas0","uv":[4.0,0.0,4.5,2.0]},"west":{"texture":"atlas0","uv":[4.5,0.0,5.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,15.0,2.0,15.5]},"down":{"texture":"atlas0","uv":[0.0,15.5,2.0,16.0]},"north":{"texture":"atlas0","uv":[6.0,13.0,8.0,15.0]}}},{"from":[6,10,6],"to":[10,11,10],"faces":{"east":{"texture":"atlas0","uv":[2.0,15.5,4.0,16.0]},"west":{"texture":"atlas0","uv":[4.0,15.5,6.0,16.0]},"up":{"texture":"atlas0","uv":[8.0,13.0,10.0,15.0]},"north":{"texture":"atlas0","uv":[6.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","uv":[8.0,15.5,10.0,16.0]}}}]}
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/block_operations_module.json b/src/main/resources/assets/oc2/models/item/block_operations_module.json
index 372625c5..44620c01 100644
--- a/src/main/resources/assets/oc2/models/item/block_operations_module.json
+++ b/src/main/resources/assets/oc2/models/item/block_operations_module.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/block_operations_module"
+    "layer0": "oc2:item/block_operations_module"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/flash_memory.json b/src/main/resources/assets/oc2/models/item/flash_memory.json
index 93f76253..be7545b2 100644
--- a/src/main/resources/assets/oc2/models/item/flash_memory.json
+++ b/src/main/resources/assets/oc2/models/item/flash_memory.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/flash_memory"
+    "layer0": "oc2:item/flash_memory"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/hard_drive.json b/src/main/resources/assets/oc2/models/item/hard_drive.json
index bd25ae5a..91c512ab 100644
--- a/src/main/resources/assets/oc2/models/item/hard_drive.json
+++ b/src/main/resources/assets/oc2/models/item/hard_drive.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/hard_drive1"
+    "layer0": "oc2:item/hard_drive1"
   },
   "overrides": [
     {
diff --git a/src/main/resources/assets/oc2/models/item/hard_drive2.json b/src/main/resources/assets/oc2/models/item/hard_drive2.json
index 6785edc1..39ce7a99 100644
--- a/src/main/resources/assets/oc2/models/item/hard_drive2.json
+++ b/src/main/resources/assets/oc2/models/item/hard_drive2.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/hard_drive2"
+    "layer0": "oc2:item/hard_drive2"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/hard_drive3.json b/src/main/resources/assets/oc2/models/item/hard_drive3.json
index 1bee5b8a..2bc764f6 100644
--- a/src/main/resources/assets/oc2/models/item/hard_drive3.json
+++ b/src/main/resources/assets/oc2/models/item/hard_drive3.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/hard_drive3"
+    "layer0": "oc2:item/hard_drive3"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/inventory_operations_module.json b/src/main/resources/assets/oc2/models/item/inventory_operations_module.json
index 1a452801..5b3112b9 100644
--- a/src/main/resources/assets/oc2/models/item/inventory_operations_module.json
+++ b/src/main/resources/assets/oc2/models/item/inventory_operations_module.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/inventory_operations_module"
+    "layer0": "oc2:item/inventory_operations_module"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/memory.json b/src/main/resources/assets/oc2/models/item/memory.json
index daf5fd3b..14e614b8 100644
--- a/src/main/resources/assets/oc2/models/item/memory.json
+++ b/src/main/resources/assets/oc2/models/item/memory.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/memory1"
+    "layer0": "oc2:item/memory1"
   },
   "overrides": [
     {
diff --git a/src/main/resources/assets/oc2/models/item/memory2.json b/src/main/resources/assets/oc2/models/item/memory2.json
index 0fcaf687..b5a8c531 100644
--- a/src/main/resources/assets/oc2/models/item/memory2.json
+++ b/src/main/resources/assets/oc2/models/item/memory2.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/memory2"
+    "layer0": "oc2:item/memory2"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/memory3.json b/src/main/resources/assets/oc2/models/item/memory3.json
index ca86ec29..d5c68e56 100644
--- a/src/main/resources/assets/oc2/models/item/memory3.json
+++ b/src/main/resources/assets/oc2/models/item/memory3.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/memory3"
+    "layer0": "oc2:item/memory3"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/network_cable.json b/src/main/resources/assets/oc2/models/item/network_cable.json
index 71b0cfc9..4f40fd55 100644
--- a/src/main/resources/assets/oc2/models/item/network_cable.json
+++ b/src/main/resources/assets/oc2/models/item/network_cable.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/network_cable"
+    "layer0": "oc2:item/network_cable"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/network_interface_card.json b/src/main/resources/assets/oc2/models/item/network_interface_card.json
index 2c99f043..2f20da9a 100644
--- a/src/main/resources/assets/oc2/models/item/network_interface_card.json
+++ b/src/main/resources/assets/oc2/models/item/network_interface_card.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/network_interface_card"
+    "layer0": "oc2:item/network_interface_card"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/redstone_interface_card.json b/src/main/resources/assets/oc2/models/item/redstone_interface_card.json
index 4ae881f8..4cca21ac 100644
--- a/src/main/resources/assets/oc2/models/item/redstone_interface_card.json
+++ b/src/main/resources/assets/oc2/models/item/redstone_interface_card.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/redstone_interface_card"
+    "layer0": "oc2:item/redstone_interface_card"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/wrench.json b/src/main/resources/assets/oc2/models/item/wrench.json
index 96381e1a..237a39fb 100644
--- a/src/main/resources/assets/oc2/models/item/wrench.json
+++ b/src/main/resources/assets/oc2/models/item/wrench.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/handheld",
   "textures": {
-    "layer0": "oc2:items/wrench"
+    "layer0": "oc2:item/wrench"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/textures/blocks/cable_base/cable_base_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_base/cable_base_atlas0.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/cable_base/cable_base_atlas0.png
rename to src/main/resources/assets/oc2/textures/block/cable_base/cable_base_atlas0.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/cable_link/cable_link_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_link/cable_link_atlas0.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/cable_link/cable_link_atlas0.png
rename to src/main/resources/assets/oc2/textures/block/cable_link/cable_link_atlas0.png
diff --git a/src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png
new file mode 100644
index 00000000..a2bb5acf
Binary files /dev/null and b/src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png differ
diff --git a/src/main/resources/assets/oc2/textures/blocks/cable_straight/cable_straight_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_straight/cable_straight_atlas0.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/cable_straight/cable_straight_atlas0.png
rename to src/main/resources/assets/oc2/textures/block/cable_straight/cable_straight_atlas0.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/cable_support/cable_support_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_support/cable_support_atlas0.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/cable_support/cable_support_atlas0.png
rename to src/main/resources/assets/oc2/textures/block/cable_support/cable_support_atlas0.png
diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png
new file mode 100644
index 00000000..f130ec77
Binary files /dev/null and b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png differ
diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas1.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas1.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas1.png
rename to src/main/resources/assets/oc2/textures/block/computer/computer_atlas1.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas2.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas2.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas2.png
rename to src/main/resources/assets/oc2/textures/block/computer/computer_atlas2.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas3.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas3.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas3.png
rename to src/main/resources/assets/oc2/textures/block/computer/computer_atlas3.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas4.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas4.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas4.png
rename to src/main/resources/assets/oc2/textures/block/computer/computer_atlas4.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_overlay_power.png b/src/main/resources/assets/oc2/textures/block/computer/computer_overlay_power.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/computer/computer_overlay_power.png
rename to src/main/resources/assets/oc2/textures/block/computer/computer_overlay_power.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_overlay_status.png b/src/main/resources/assets/oc2/textures/block/computer/computer_overlay_status.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/computer/computer_overlay_status.png
rename to src/main/resources/assets/oc2/textures/block/computer/computer_overlay_status.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_overlay_terminal.png b/src/main/resources/assets/oc2/textures/block/computer/computer_overlay_terminal.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/computer/computer_overlay_terminal.png
rename to src/main/resources/assets/oc2/textures/block/computer/computer_overlay_terminal.png
diff --git a/src/main/resources/assets/oc2/textures/block/network_connector/network_connector_atlas0.png b/src/main/resources/assets/oc2/textures/block/network_connector/network_connector_atlas0.png
new file mode 100644
index 00000000..2b2af6f0
Binary files /dev/null and b/src/main/resources/assets/oc2/textures/block/network_connector/network_connector_atlas0.png differ
diff --git a/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png
new file mode 100644
index 00000000..6ff55190
Binary files /dev/null and b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png differ
diff --git a/src/main/resources/assets/oc2/textures/blocks/network_hub/network_hub_atlas1.png b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas1.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/network_hub/network_hub_atlas1.png
rename to src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas1.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/network_hub/network_hub_atlas2.png b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas2.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/network_hub/network_hub_atlas2.png
rename to src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas2.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/network_hub/network_hub_atlas3.png b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas3.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/network_hub/network_hub_atlas3.png
rename to src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas3.png
diff --git a/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas0.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas0.png
new file mode 100644
index 00000000..8668b013
Binary files /dev/null and b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas0.png differ
diff --git a/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas1.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas1.png
new file mode 100644
index 00000000..7cb4986c
Binary files /dev/null and b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas1.png differ
diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas2.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas2.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas2.png
rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas2.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas3.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas3.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas3.png
rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas3.png
diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas4.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas4.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas4.png
rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas4.png
diff --git a/src/main/resources/assets/oc2/textures/items/block_operations_module.png b/src/main/resources/assets/oc2/textures/item/block_operations_module.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/block_operations_module.png
rename to src/main/resources/assets/oc2/textures/item/block_operations_module.png
diff --git a/src/main/resources/assets/oc2/textures/items/flash_memory.png b/src/main/resources/assets/oc2/textures/item/flash_memory.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/flash_memory.png
rename to src/main/resources/assets/oc2/textures/item/flash_memory.png
diff --git a/src/main/resources/assets/oc2/textures/items/hard_drive1.png b/src/main/resources/assets/oc2/textures/item/hard_drive1.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/hard_drive1.png
rename to src/main/resources/assets/oc2/textures/item/hard_drive1.png
diff --git a/src/main/resources/assets/oc2/textures/items/hard_drive2.png b/src/main/resources/assets/oc2/textures/item/hard_drive2.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/hard_drive2.png
rename to src/main/resources/assets/oc2/textures/item/hard_drive2.png
diff --git a/src/main/resources/assets/oc2/textures/items/hard_drive3.png b/src/main/resources/assets/oc2/textures/item/hard_drive3.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/hard_drive3.png
rename to src/main/resources/assets/oc2/textures/item/hard_drive3.png
diff --git a/src/main/resources/assets/oc2/textures/items/inventory_operations_module.png b/src/main/resources/assets/oc2/textures/item/inventory_operations_module.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/inventory_operations_module.png
rename to src/main/resources/assets/oc2/textures/item/inventory_operations_module.png
diff --git a/src/main/resources/assets/oc2/textures/items/memory1.png b/src/main/resources/assets/oc2/textures/item/memory1.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/memory1.png
rename to src/main/resources/assets/oc2/textures/item/memory1.png
diff --git a/src/main/resources/assets/oc2/textures/items/memory2.png b/src/main/resources/assets/oc2/textures/item/memory2.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/memory2.png
rename to src/main/resources/assets/oc2/textures/item/memory2.png
diff --git a/src/main/resources/assets/oc2/textures/items/memory3.png b/src/main/resources/assets/oc2/textures/item/memory3.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/memory3.png
rename to src/main/resources/assets/oc2/textures/item/memory3.png
diff --git a/src/main/resources/assets/oc2/textures/items/network_cable.png b/src/main/resources/assets/oc2/textures/item/network_cable.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/network_cable.png
rename to src/main/resources/assets/oc2/textures/item/network_cable.png
diff --git a/src/main/resources/assets/oc2/textures/items/network_interface_card.png b/src/main/resources/assets/oc2/textures/item/network_interface_card.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/network_interface_card.png
rename to src/main/resources/assets/oc2/textures/item/network_interface_card.png
diff --git a/src/main/resources/assets/oc2/textures/items/redstone_interface_card.png b/src/main/resources/assets/oc2/textures/item/redstone_interface_card.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/redstone_interface_card.png
rename to src/main/resources/assets/oc2/textures/item/redstone_interface_card.png
diff --git a/src/main/resources/assets/oc2/textures/items/wrench.png b/src/main/resources/assets/oc2/textures/item/wrench.png
similarity index 100%
rename from src/main/resources/assets/oc2/textures/items/wrench.png
rename to src/main/resources/assets/oc2/textures/item/wrench.png