diff --git a/src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java b/src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java
index c9c2cac..76f32fd 100644
--- a/src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java
+++ b/src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java
@@ -3,7 +3,7 @@ package net.shadowfacts.phycon.mixin.client;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.slot.Slot;
-import net.shadowfacts.phycon.network.block.terminal.TerminalScreen;
+import net.shadowfacts.phycon.block.terminal.TerminalScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
diff --git a/src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt b/src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt
index c32c7b4..145a624 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt
@@ -7,7 +7,7 @@ import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry
 import net.minecraft.client.render.RenderLayer
 import net.shadowfacts.phycon.init.PhyBlocks
 import net.shadowfacts.phycon.init.PhyScreens
-import net.shadowfacts.phycon.network.block.terminal.TerminalScreen
+import net.shadowfacts.phycon.block.terminal.TerminalScreen
 import net.shadowfacts.phycon.networking.ClientReceiver
 import net.shadowfacts.phycon.networking.S2CTerminalUpdateDisplayedItems
 
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/DeviceBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlock.kt
similarity index 91%
rename from src/main/kotlin/net/shadowfacts/phycon/network/DeviceBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlock.kt
index 989b2b3..560888b 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/DeviceBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlock.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network
+package net.shadowfacts.phycon.block
 
 import net.minecraft.block.BlockState
 import net.minecraft.entity.player.PlayerEntity
@@ -8,7 +8,6 @@ import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
 import net.shadowfacts.phycon.api.Interface
 import net.shadowfacts.phycon.api.NetworkComponentBlock
-import net.shadowfacts.phycon.block.BlockWithEntity
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/DeviceBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlockEntity.kt
similarity index 95%
rename from src/main/kotlin/net/shadowfacts/phycon/network/DeviceBlockEntity.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlockEntity.kt
index b30553b..6fca181 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/DeviceBlockEntity.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlockEntity.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network
+package net.shadowfacts.phycon.block
 
 import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable
 import net.minecraft.block.BlockState
@@ -16,10 +16,11 @@ import net.shadowfacts.phycon.api.frame.PacketFrame
 import net.shadowfacts.phycon.api.packet.Packet
 import net.shadowfacts.phycon.api.util.IPAddress
 import net.shadowfacts.phycon.api.util.MACAddress
-import net.shadowfacts.phycon.network.frame.ARPQueryFrame
-import net.shadowfacts.phycon.network.frame.ARPResponseFrame
-import net.shadowfacts.phycon.network.frame.BasePacketFrame
-import net.shadowfacts.phycon.network.packet.*
+import net.shadowfacts.phycon.util.NetworkUtil
+import net.shadowfacts.phycon.frame.ARPQueryFrame
+import net.shadowfacts.phycon.frame.ARPResponseFrame
+import net.shadowfacts.phycon.frame.BasePacketFrame
+import net.shadowfacts.phycon.packet.*
 import java.util.*
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/FaceDeviceBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/FaceDeviceBlock.kt
similarity index 97%
rename from src/main/kotlin/net/shadowfacts/phycon/network/FaceDeviceBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/FaceDeviceBlock.kt
index b787008..a7f77d7 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/FaceDeviceBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/FaceDeviceBlock.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network
+package net.shadowfacts.phycon.block
 
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
@@ -16,7 +16,7 @@ import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
 import net.shadowfacts.phycon.api.Interface
 import net.shadowfacts.phycon.api.NetworkComponentBlock
-import net.shadowfacts.phycon.network.block.cable.CableBlock
+import net.shadowfacts.phycon.block.cable.CableBlock
 import java.util.*
 
 
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/cable/CableBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/cable/CableBlock.kt
similarity index 99%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/cable/CableBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/cable/CableBlock.kt
index b0daaad..1e92db8 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/cable/CableBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/cable/CableBlock.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.cable
+package net.shadowfacts.phycon.block.cable
 
 import net.minecraft.block.*
 import net.minecraft.block.piston.PistonBehavior
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/extractor/ExtractorBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlock.kt
similarity index 97%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/extractor/ExtractorBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlock.kt
index 618bacf..4e3747a 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/extractor/ExtractorBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlock.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.extractor
+package net.shadowfacts.phycon.block.extractor
 
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
@@ -19,7 +19,7 @@ import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
 import net.shadowfacts.phycon.PhysicalConnectivity
 import net.shadowfacts.phycon.api.Interface
-import net.shadowfacts.phycon.network.DeviceBlock
+import net.shadowfacts.phycon.block.DeviceBlock
 import java.util.*
 
 /**
@@ -108,4 +108,4 @@ class ExtractorBlock: DeviceBlock<ExtractorBlockEntity>(Settings.of(Material.MET
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/extractor/ExtractorBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlockEntity.kt
similarity index 88%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/extractor/ExtractorBlockEntity.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlockEntity.kt
index 7d83833..ed8f4cd 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/extractor/ExtractorBlockEntity.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlockEntity.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.extractor
+package net.shadowfacts.phycon.block.extractor
 
 import alexiil.mc.lib.attributes.SearchOptions
 import alexiil.mc.lib.attributes.Simulation
@@ -11,13 +11,13 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.util.math.Direction
 import net.shadowfacts.phycon.api.packet.Packet
 import net.shadowfacts.phycon.init.PhyBlockEntities
-import net.shadowfacts.phycon.network.DeviceBlockEntity
-import net.shadowfacts.phycon.network.component.ActivationController
-import net.shadowfacts.phycon.network.component.NetworkStackDispatcher
-import net.shadowfacts.phycon.network.component.handleItemStack
-import net.shadowfacts.phycon.network.packet.CapacityPacket
-import net.shadowfacts.phycon.network.packet.ItemStackPacket
-import net.shadowfacts.phycon.network.packet.RemoteActivationPacket
+import net.shadowfacts.phycon.block.DeviceBlockEntity
+import net.shadowfacts.phycon.component.ActivationController
+import net.shadowfacts.phycon.component.NetworkStackDispatcher
+import net.shadowfacts.phycon.component.handleItemStack
+import net.shadowfacts.phycon.packet.CapacityPacket
+import net.shadowfacts.phycon.packet.ItemStackPacket
+import net.shadowfacts.phycon.packet.RemoteActivationPacket
 import net.shadowfacts.phycon.util.ActivationMode
 import kotlin.properties.Delegates
 
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/miner/MinerBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlock.kt
similarity index 92%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/miner/MinerBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlock.kt
index 77a07a8..097ed76 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/miner/MinerBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlock.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.miner
+package net.shadowfacts.phycon.block.miner
 
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
@@ -16,8 +16,8 @@ import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
 import net.shadowfacts.phycon.PhysicalConnectivity
 import net.shadowfacts.phycon.api.Interface
-import net.shadowfacts.phycon.network.DeviceBlock
-import net.shadowfacts.phycon.network.block.extractor.ExtractorBlock
+import net.shadowfacts.phycon.block.DeviceBlock
+import net.shadowfacts.phycon.block.extractor.ExtractorBlock
 import java.util.*
 
 /**
@@ -66,4 +66,4 @@ class MinerBlock: DeviceBlock<MinerBlockEntity>(Settings.of(Material.METAL)) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/miner/MinerBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlockEntity.kt
similarity index 89%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/miner/MinerBlockEntity.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlockEntity.kt
index 40deab2..58aeabf 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/miner/MinerBlockEntity.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlockEntity.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.miner
+package net.shadowfacts.phycon.block.miner
 
 import alexiil.mc.lib.attributes.item.GroupedItemInvView
 import alexiil.mc.lib.attributes.item.ItemStackUtil
@@ -11,15 +11,13 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.minecraft.world.World
 import net.shadowfacts.phycon.api.packet.Packet
-import net.shadowfacts.phycon.api.util.IPAddress
 import net.shadowfacts.phycon.init.PhyBlockEntities
-import net.shadowfacts.phycon.network.DeviceBlockEntity
-import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity
-import net.shadowfacts.phycon.network.component.NetworkStackDispatcher
-import net.shadowfacts.phycon.network.component.NetworkStackProvider
-import net.shadowfacts.phycon.network.component.handleItemStack
-import net.shadowfacts.phycon.network.component.spawnItemStack
-import net.shadowfacts.phycon.network.packet.*
+import net.shadowfacts.phycon.block.DeviceBlockEntity
+import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
+import net.shadowfacts.phycon.component.NetworkStackDispatcher
+import net.shadowfacts.phycon.component.NetworkStackProvider
+import net.shadowfacts.phycon.component.handleItemStack
+import net.shadowfacts.phycon.packet.*
 import kotlin.math.min
 
 /**
@@ -144,4 +142,4 @@ class MinerBlockEntity: DeviceBlockEntity(PhyBlockEntities.MINER),
 	class PendingInsertion(stack: ItemStack, timestamp: Long): NetworkStackDispatcher.PendingInsertion<PendingInsertion>(stack, timestamp) {
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/netinterface/InterfaceBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlock.kt
similarity index 94%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/netinterface/InterfaceBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlock.kt
index 0a091ff..af4af0f 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/netinterface/InterfaceBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlock.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.netinterface
+package net.shadowfacts.phycon.block.netinterface
 
 import alexiil.mc.lib.attributes.AttributeList
 import alexiil.mc.lib.attributes.AttributeProvider
@@ -12,7 +12,7 @@ import net.minecraft.world.BlockView
 import net.minecraft.world.World
 import net.shadowfacts.phycon.PhysicalConnectivity
 import net.shadowfacts.phycon.api.NetworkComponentBlock
-import net.shadowfacts.phycon.network.FaceDeviceBlock
+import net.shadowfacts.phycon.block.FaceDeviceBlock
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/netinterface/InterfaceBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlockEntity.kt
similarity index 86%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/netinterface/InterfaceBlockEntity.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlockEntity.kt
index 9cb58ae..3659963 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/netinterface/InterfaceBlockEntity.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlockEntity.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.netinterface
+package net.shadowfacts.phycon.block.netinterface
 
 import alexiil.mc.lib.attributes.SearchOptions
 import alexiil.mc.lib.attributes.Simulation
@@ -8,13 +8,13 @@ import net.minecraft.item.ItemStack
 import net.minecraft.util.math.Direction
 import net.shadowfacts.phycon.api.packet.Packet
 import net.shadowfacts.phycon.init.PhyBlockEntities
-import net.shadowfacts.phycon.network.DeviceBlockEntity
-import net.shadowfacts.phycon.network.FaceDeviceBlock
-import net.shadowfacts.phycon.network.component.ItemStackPacketHandler
-import net.shadowfacts.phycon.network.component.NetworkStackProvider
-import net.shadowfacts.phycon.network.component.NetworkStackReceiver
-import net.shadowfacts.phycon.network.component.handleItemStack
-import net.shadowfacts.phycon.network.packet.*
+import net.shadowfacts.phycon.block.DeviceBlockEntity
+import net.shadowfacts.phycon.block.FaceDeviceBlock
+import net.shadowfacts.phycon.component.ItemStackPacketHandler
+import net.shadowfacts.phycon.component.NetworkStackProvider
+import net.shadowfacts.phycon.component.NetworkStackReceiver
+import net.shadowfacts.phycon.component.handleItemStack
+import net.shadowfacts.phycon.packet.*
 import kotlin.math.min
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/netswitch/SwitchBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlock.kt
similarity index 96%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/netswitch/SwitchBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlock.kt
index af6a032..e85ddbe 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/netswitch/SwitchBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlock.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.netswitch
+package net.shadowfacts.phycon.block.netswitch
 
 import alexiil.mc.lib.attributes.AttributeList
 import alexiil.mc.lib.attributes.AttributeProvider
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/netswitch/SwitchBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlockEntity.kt
similarity index 95%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/netswitch/SwitchBlockEntity.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlockEntity.kt
index 23c54b8..5f9f3f9 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/netswitch/SwitchBlockEntity.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlockEntity.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.netswitch
+package net.shadowfacts.phycon.block.netswitch
 
 import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable
 import net.minecraft.block.BlockState
@@ -13,8 +13,8 @@ import net.shadowfacts.phycon.api.frame.EthernetFrame
 import net.shadowfacts.phycon.api.frame.PacketFrame
 import net.shadowfacts.phycon.api.util.MACAddress
 import net.shadowfacts.phycon.init.PhyBlockEntities
-import net.shadowfacts.phycon.network.NetworkUtil
-import net.shadowfacts.phycon.network.packet.ItemStackPacket
+import net.shadowfacts.phycon.util.NetworkUtil
+import net.shadowfacts.phycon.packet.ItemStackPacket
 import java.lang.ref.WeakReference
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/redstone/RedstoneControllerBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlock.kt
similarity index 92%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/redstone/RedstoneControllerBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlock.kt
index 51d4773..b7d52c7 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/redstone/RedstoneControllerBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlock.kt
@@ -1,10 +1,9 @@
-package net.shadowfacts.phycon.network.block.redstone
+package net.shadowfacts.phycon.block.redstone
 
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
 import net.minecraft.block.Material
 import net.minecraft.item.ItemPlacementContext
-import net.minecraft.server.world.ServerWorld
 import net.minecraft.state.StateManager
 import net.minecraft.state.property.Properties
 import net.minecraft.util.Identifier
@@ -12,10 +11,8 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.minecraft.world.BlockView
 import net.minecraft.world.World
-import net.minecraft.world.WorldAccess
 import net.shadowfacts.phycon.PhysicalConnectivity
-import net.shadowfacts.phycon.network.FaceDeviceBlock
-import java.util.*
+import net.shadowfacts.phycon.block.FaceDeviceBlock
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/redstone/RedstoneControllerBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlockEntity.kt
similarity index 93%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/redstone/RedstoneControllerBlockEntity.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlockEntity.kt
index d9bbfbb..03397b3 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/redstone/RedstoneControllerBlockEntity.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlockEntity.kt
@@ -1,12 +1,12 @@
-package net.shadowfacts.phycon.network.block.redstone
+package net.shadowfacts.phycon.block.redstone
 
 import net.minecraft.block.BlockState
 import net.minecraft.nbt.CompoundTag
 import net.shadowfacts.phycon.api.packet.Packet
 import net.shadowfacts.phycon.api.util.IPAddress
 import net.shadowfacts.phycon.init.PhyBlockEntities
-import net.shadowfacts.phycon.network.DeviceBlockEntity
-import net.shadowfacts.phycon.network.packet.RemoteActivationPacket
+import net.shadowfacts.phycon.block.DeviceBlockEntity
+import net.shadowfacts.phycon.packet.RemoteActivationPacket
 import net.shadowfacts.phycon.util.RedstoneMode
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlock.kt
similarity index 93%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlock.kt
index c665f91..627be2e 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlock.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.terminal
+package net.shadowfacts.phycon.block.terminal
 
 import alexiil.mc.lib.attributes.AttributeList
 import alexiil.mc.lib.attributes.AttributeProvider
@@ -16,7 +16,7 @@ import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
 import net.shadowfacts.phycon.PhysicalConnectivity
 import net.shadowfacts.phycon.api.NetworkComponentBlock
-import net.shadowfacts.phycon.network.DeviceBlock
+import net.shadowfacts.phycon.block.DeviceBlock
 import java.util.*
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlockEntity.kt
similarity index 96%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlockEntity.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlockEntity.kt
index e17af71..de7fc8c 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlockEntity.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlockEntity.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.terminal
+package net.shadowfacts.phycon.block.terminal
 
 import alexiil.mc.lib.attributes.item.GroupedItemInvView
 import alexiil.mc.lib.attributes.item.ItemStackCollections
@@ -12,7 +12,6 @@ import net.minecraft.inventory.Inventory
 import net.minecraft.inventory.InventoryChangedListener
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.ListTag
 import net.minecraft.network.PacketByteBuf
 import net.minecraft.screen.ScreenHandler
 import net.minecraft.server.network.ServerPlayerEntity
@@ -23,10 +22,10 @@ import net.shadowfacts.phycon.api.Interface
 import net.shadowfacts.phycon.api.packet.Packet
 import net.shadowfacts.phycon.api.util.IPAddress
 import net.shadowfacts.phycon.init.PhyBlockEntities
-import net.shadowfacts.phycon.network.DeviceBlockEntity
-import net.shadowfacts.phycon.network.NetworkUtil
-import net.shadowfacts.phycon.network.component.*
-import net.shadowfacts.phycon.network.packet.*
+import net.shadowfacts.phycon.block.DeviceBlockEntity
+import net.shadowfacts.phycon.util.NetworkUtil
+import net.shadowfacts.phycon.component.*
+import net.shadowfacts.phycon.packet.*
 import java.lang.ref.WeakReference
 import java.util.*
 import kotlin.math.min
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBufferInventory.kt b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBufferInventory.kt
similarity index 97%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBufferInventory.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBufferInventory.kt
index 145d31f..492715b 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBufferInventory.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBufferInventory.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.terminal
+package net.shadowfacts.phycon.block.terminal
 
 import alexiil.mc.lib.attributes.item.ItemStackUtil
 import net.minecraft.inventory.SimpleInventory
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalFakeSlot.kt b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalFakeSlot.kt
similarity index 95%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalFakeSlot.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalFakeSlot.kt
index 5fd22c4..39726dc 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalFakeSlot.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalFakeSlot.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.terminal
+package net.shadowfacts.phycon.block.terminal
 
 import net.minecraft.screen.slot.Slot
 import net.minecraft.entity.player.PlayerEntity
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalScreen.kt b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreen.kt
similarity index 99%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalScreen.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreen.kt
index 762c0e9..c4fb999 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalScreen.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreen.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.block.terminal
+package net.shadowfacts.phycon.block.terminal
 
 import com.mojang.blaze3d.systems.RenderSystem
 import net.minecraft.client.MinecraftClient
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalScreenHandler.kt b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreenHandler.kt
similarity index 97%
rename from src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalScreenHandler.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreenHandler.kt
index e361c85..e5c592a 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalScreenHandler.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreenHandler.kt
@@ -1,6 +1,5 @@
-package net.shadowfacts.phycon.network.block.terminal
+package net.shadowfacts.phycon.block.terminal
 
-import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.screen.slot.Slot
 import net.minecraft.screen.slot.SlotActionType
 import net.minecraft.entity.player.PlayerEntity
@@ -14,11 +13,9 @@ import net.minecraft.util.registry.Registry
 import net.shadowfacts.phycon.PhysicalConnectivity
 import net.shadowfacts.phycon.init.PhyBlocks
 import net.shadowfacts.phycon.init.PhyScreens
-import net.shadowfacts.phycon.networking.C2STerminalRequestItem
 import net.shadowfacts.phycon.networking.S2CTerminalUpdateDisplayedItems
 import net.shadowfacts.phycon.util.SortMode
 import java.lang.ref.WeakReference
-import kotlin.math.ceil
 import kotlin.math.min
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/component/ActivationController.kt b/src/main/kotlin/net/shadowfacts/phycon/component/ActivationController.kt
similarity index 91%
rename from src/main/kotlin/net/shadowfacts/phycon/network/component/ActivationController.kt
rename to src/main/kotlin/net/shadowfacts/phycon/component/ActivationController.kt
index 5ec6b2c..e559b52 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/component/ActivationController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/component/ActivationController.kt
@@ -1,7 +1,7 @@
-package net.shadowfacts.phycon.network.component
+package net.shadowfacts.phycon.component
 
 import net.minecraft.block.entity.BlockEntity
-import net.shadowfacts.phycon.network.packet.RemoteActivationPacket
+import net.shadowfacts.phycon.packet.RemoteActivationPacket
 import net.shadowfacts.phycon.util.ActivationMode
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/component/ItemStackPacketHandler.kt b/src/main/kotlin/net/shadowfacts/phycon/component/ItemStackPacketHandler.kt
similarity index 91%
rename from src/main/kotlin/net/shadowfacts/phycon/network/component/ItemStackPacketHandler.kt
rename to src/main/kotlin/net/shadowfacts/phycon/component/ItemStackPacketHandler.kt
index 64e92f3..2bb7de5 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/component/ItemStackPacketHandler.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/component/ItemStackPacketHandler.kt
@@ -1,11 +1,11 @@
-package net.shadowfacts.phycon.network.component
+package net.shadowfacts.phycon.component
 
 import net.minecraft.block.entity.BlockEntity
 import net.minecraft.entity.ItemEntity
 import net.minecraft.item.ItemStack
 import net.shadowfacts.phycon.api.PacketSink
 import net.shadowfacts.phycon.api.PacketSource
-import net.shadowfacts.phycon.network.packet.ItemStackPacket
+import net.shadowfacts.phycon.packet.ItemStackPacket
 
 /**
  * @author shadowfacts
@@ -32,4 +32,4 @@ fun <Self> Self.spawnItemStack(stack: ItemStack) where Self: BlockEntity, Self:
 	// todo: calculate entity spawn point by finding non-obstructed location
 	val entity = ItemEntity(world!!, pos.x.toDouble(), pos.y + 1.0, pos.z.toDouble(), stack)
 	world!!.spawnEntity(entity)
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackDispatcher.kt b/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackDispatcher.kt
similarity index 92%
rename from src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackDispatcher.kt
rename to src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackDispatcher.kt
index 6d2f3f6..ae2f329 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackDispatcher.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackDispatcher.kt
@@ -1,12 +1,12 @@
-package net.shadowfacts.phycon.network.component
+package net.shadowfacts.phycon.component
 
 import alexiil.mc.lib.attributes.item.ItemStackUtil
 import net.minecraft.block.entity.BlockEntity
 import net.minecraft.item.ItemStack
 import net.shadowfacts.phycon.api.util.IPAddress
-import net.shadowfacts.phycon.network.packet.CapacityPacket
-import net.shadowfacts.phycon.network.packet.CheckCapacityPacket
-import net.shadowfacts.phycon.network.packet.ItemStackPacket
+import net.shadowfacts.phycon.packet.CapacityPacket
+import net.shadowfacts.phycon.packet.CheckCapacityPacket
+import net.shadowfacts.phycon.packet.ItemStackPacket
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackProvider.kt b/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackProvider.kt
similarity index 72%
rename from src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackProvider.kt
rename to src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackProvider.kt
index 4397469..192d642 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackProvider.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackProvider.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.component
+package net.shadowfacts.phycon.component
 
 import net.shadowfacts.phycon.api.NetworkDevice
 
@@ -6,4 +6,4 @@ import net.shadowfacts.phycon.api.NetworkDevice
  * @author shadowfacts
  */
 interface NetworkStackProvider: NetworkDevice {
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackReceiver.kt b/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackReceiver.kt
similarity index 72%
rename from src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackReceiver.kt
rename to src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackReceiver.kt
index b9aa7d0..a079314 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackReceiver.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackReceiver.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.component
+package net.shadowfacts.phycon.component
 
 import net.shadowfacts.phycon.api.NetworkDevice
 
@@ -6,4 +6,4 @@ import net.shadowfacts.phycon.api.NetworkDevice
  * @author shadowfacts
  */
 interface NetworkStackReceiver: NetworkDevice {
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/frame/ARPFrame.kt b/src/main/kotlin/net/shadowfacts/phycon/frame/ARPFrame.kt
similarity index 89%
rename from src/main/kotlin/net/shadowfacts/phycon/network/frame/ARPFrame.kt
rename to src/main/kotlin/net/shadowfacts/phycon/frame/ARPFrame.kt
index f87c161..ea39718 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/frame/ARPFrame.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/frame/ARPFrame.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.frame
+package net.shadowfacts.phycon.frame
 
 import net.shadowfacts.phycon.api.util.IPAddress
 import net.shadowfacts.phycon.api.util.MACAddress
@@ -19,4 +19,4 @@ class ARPResponseFrame(
 	source: MACAddress,
 	destination: MACAddress,
 ): BaseFrame(source, destination) {
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/frame/BaseFrame.kt b/src/main/kotlin/net/shadowfacts/phycon/frame/BaseFrame.kt
similarity index 70%
rename from src/main/kotlin/net/shadowfacts/phycon/network/frame/BaseFrame.kt
rename to src/main/kotlin/net/shadowfacts/phycon/frame/BaseFrame.kt
index e5948af..30cab17 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/frame/BaseFrame.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/frame/BaseFrame.kt
@@ -1,8 +1,6 @@
-package net.shadowfacts.phycon.network.frame
+package net.shadowfacts.phycon.frame
 
 import net.shadowfacts.phycon.api.frame.EthernetFrame
-import net.shadowfacts.phycon.api.frame.PacketFrame
-import net.shadowfacts.phycon.api.packet.Packet
 import net.shadowfacts.phycon.api.util.MACAddress
 
 /**
@@ -14,4 +12,4 @@ open class BaseFrame(
 ): EthernetFrame {
 	override fun getSource() = source
 	override fun getDestination() = destination
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/frame/BasePacketFrame.kt b/src/main/kotlin/net/shadowfacts/phycon/frame/BasePacketFrame.kt
similarity index 89%
rename from src/main/kotlin/net/shadowfacts/phycon/network/frame/BasePacketFrame.kt
rename to src/main/kotlin/net/shadowfacts/phycon/frame/BasePacketFrame.kt
index c7f6458..646efef 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/frame/BasePacketFrame.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/frame/BasePacketFrame.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.frame
+package net.shadowfacts.phycon.frame
 
 import net.shadowfacts.phycon.api.frame.PacketFrame
 import net.shadowfacts.phycon.api.packet.Packet
@@ -13,4 +13,4 @@ class BasePacketFrame(
 	destination: MACAddress,
 ): BaseFrame(source, destination), PacketFrame {
 	override fun getPacket() = packet
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlockEntities.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlockEntities.kt
index 106d8df..227c344 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlockEntities.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlockEntities.kt
@@ -5,18 +5,18 @@ import net.minecraft.block.entity.BlockEntity
 import net.minecraft.block.entity.BlockEntityType
 import net.minecraft.util.Identifier
 import net.minecraft.util.registry.Registry
-import net.shadowfacts.phycon.network.block.extractor.ExtractorBlock
-import net.shadowfacts.phycon.network.block.extractor.ExtractorBlockEntity
-import net.shadowfacts.phycon.network.block.miner.MinerBlock
-import net.shadowfacts.phycon.network.block.miner.MinerBlockEntity
-import net.shadowfacts.phycon.network.block.netinterface.InterfaceBlock
-import net.shadowfacts.phycon.network.block.netinterface.InterfaceBlockEntity
-import net.shadowfacts.phycon.network.block.netswitch.SwitchBlock
-import net.shadowfacts.phycon.network.block.netswitch.SwitchBlockEntity
-import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlock
-import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlockEntity
-import net.shadowfacts.phycon.network.block.terminal.TerminalBlock
-import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity
+import net.shadowfacts.phycon.block.extractor.ExtractorBlock
+import net.shadowfacts.phycon.block.extractor.ExtractorBlockEntity
+import net.shadowfacts.phycon.block.miner.MinerBlock
+import net.shadowfacts.phycon.block.miner.MinerBlockEntity
+import net.shadowfacts.phycon.block.netinterface.InterfaceBlock
+import net.shadowfacts.phycon.block.netinterface.InterfaceBlockEntity
+import net.shadowfacts.phycon.block.netswitch.SwitchBlock
+import net.shadowfacts.phycon.block.netswitch.SwitchBlockEntity
+import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlock
+import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlockEntity
+import net.shadowfacts.phycon.block.terminal.TerminalBlock
+import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt
index f0171e9..41cd8df 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt
@@ -3,13 +3,13 @@ package net.shadowfacts.phycon.init
 import net.minecraft.block.Block
 import net.minecraft.util.Identifier
 import net.minecraft.util.registry.Registry
-import net.shadowfacts.phycon.network.block.cable.CableBlock
-import net.shadowfacts.phycon.network.block.extractor.ExtractorBlock
-import net.shadowfacts.phycon.network.block.miner.MinerBlock
-import net.shadowfacts.phycon.network.block.netinterface.InterfaceBlock
-import net.shadowfacts.phycon.network.block.netswitch.SwitchBlock
-import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlock
-import net.shadowfacts.phycon.network.block.terminal.TerminalBlock
+import net.shadowfacts.phycon.block.cable.CableBlock
+import net.shadowfacts.phycon.block.extractor.ExtractorBlock
+import net.shadowfacts.phycon.block.miner.MinerBlock
+import net.shadowfacts.phycon.block.netinterface.InterfaceBlock
+import net.shadowfacts.phycon.block.netswitch.SwitchBlock
+import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlock
+import net.shadowfacts.phycon.block.terminal.TerminalBlock
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
index 6d9311f..de01063 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
@@ -6,13 +6,13 @@ import net.minecraft.util.Identifier
 import net.minecraft.util.registry.Registry
 import net.shadowfacts.phycon.item.ConsoleItem
 import net.shadowfacts.phycon.item.ScrewdriverItem
-import net.shadowfacts.phycon.network.block.cable.CableBlock
-import net.shadowfacts.phycon.network.block.extractor.ExtractorBlock
-import net.shadowfacts.phycon.network.block.miner.MinerBlock
-import net.shadowfacts.phycon.network.block.netinterface.InterfaceBlock
-import net.shadowfacts.phycon.network.block.netswitch.SwitchBlock
-import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlock
-import net.shadowfacts.phycon.network.block.terminal.TerminalBlock
+import net.shadowfacts.phycon.block.cable.CableBlock
+import net.shadowfacts.phycon.block.extractor.ExtractorBlock
+import net.shadowfacts.phycon.block.miner.MinerBlock
+import net.shadowfacts.phycon.block.netinterface.InterfaceBlock
+import net.shadowfacts.phycon.block.netswitch.SwitchBlock
+import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlock
+import net.shadowfacts.phycon.block.terminal.TerminalBlock
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyScreens.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyScreens.kt
index 9bd4b80..75bfd8d 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyScreens.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyScreens.kt
@@ -4,7 +4,7 @@ import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry
 import net.minecraft.screen.ScreenHandlerType
 import net.minecraft.util.Identifier
 import net.shadowfacts.phycon.PhysicalConnectivity
-import net.shadowfacts.phycon.network.block.terminal.TerminalScreenHandler
+import net.shadowfacts.phycon.block.terminal.TerminalScreenHandler
 
 object PhyScreens {
 
@@ -15,4 +15,4 @@ object PhyScreens {
 		TERMINAL_SCREEN_HANDLER = ScreenHandlerRegistry.registerExtended(Identifier(PhysicalConnectivity.MODID, "terminal"), ::TerminalScreenHandler)
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/item/ConsoleItem.kt b/src/main/kotlin/net/shadowfacts/phycon/item/ConsoleItem.kt
index 9180ad9..0dca670 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/item/ConsoleItem.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/item/ConsoleItem.kt
@@ -6,8 +6,8 @@ import net.minecraft.item.ItemUsageContext
 import net.minecraft.util.ActionResult
 import net.minecraft.util.Identifier
 import net.shadowfacts.phycon.PhysicalConnectivity
-import net.shadowfacts.phycon.network.DeviceBlock
-import net.shadowfacts.phycon.network.DeviceBlockEntity
+import net.shadowfacts.phycon.block.DeviceBlock
+import net.shadowfacts.phycon.block.DeviceBlockEntity
 import net.shadowfacts.phycon.screen.console.DeviceConsoleScreen
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureActivationMode.kt b/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureActivationMode.kt
index 3abd003..026884e 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureActivationMode.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureActivationMode.kt
@@ -11,8 +11,8 @@ import net.minecraft.util.Identifier
 import net.minecraft.util.registry.Registry
 import net.minecraft.util.registry.RegistryKey
 import net.shadowfacts.phycon.PhysicalConnectivity
-import net.shadowfacts.phycon.network.DeviceBlockEntity
-import net.shadowfacts.phycon.network.component.ActivationController
+import net.shadowfacts.phycon.block.DeviceBlockEntity
+import net.shadowfacts.phycon.component.ActivationController
 import net.shadowfacts.phycon.util.ActivationMode
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureRedstoneController.kt b/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureRedstoneController.kt
index f51ec0c..b4398ae 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureRedstoneController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureRedstoneController.kt
@@ -12,7 +12,7 @@ import net.minecraft.util.registry.Registry
 import net.minecraft.util.registry.RegistryKey
 import net.shadowfacts.phycon.PhysicalConnectivity
 import net.shadowfacts.phycon.api.util.IPAddress
-import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlockEntity
+import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlockEntity
 import net.shadowfacts.phycon.util.RedstoneMode
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalRequestItem.kt b/src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalRequestItem.kt
index b364d51..eee1eee 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalRequestItem.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalRequestItem.kt
@@ -13,7 +13,7 @@ import net.minecraft.util.Identifier
 import net.minecraft.util.registry.Registry
 import net.minecraft.util.registry.RegistryKey
 import net.shadowfacts.phycon.PhysicalConnectivity
-import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity
+import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
 
 /**
  * @author shadowfacts
@@ -52,4 +52,4 @@ object C2STerminalRequestItem: ServerReceiver {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalUpdateDisplayedItems.kt b/src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalUpdateDisplayedItems.kt
index eed71b9..f080066 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalUpdateDisplayedItems.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalUpdateDisplayedItems.kt
@@ -10,8 +10,8 @@ import net.minecraft.server.network.ServerPlayNetworkHandler
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.Identifier
 import net.shadowfacts.phycon.PhysicalConnectivity
-import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity
-import net.shadowfacts.phycon.network.block.terminal.TerminalScreenHandler
+import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
+import net.shadowfacts.phycon.block.terminal.TerminalScreenHandler
 import net.shadowfacts.phycon.util.SortMode
 
 /**
@@ -47,4 +47,4 @@ object C2STerminalUpdateDisplayedItems: ServerReceiver {
 			screenHandler.sendUpdatedItemsToClient(player, query, sortMode)
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/networking/S2CTerminalUpdateDisplayedItems.kt b/src/main/kotlin/net/shadowfacts/phycon/networking/S2CTerminalUpdateDisplayedItems.kt
index db0efe9..ccc05a1 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/networking/S2CTerminalUpdateDisplayedItems.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/networking/S2CTerminalUpdateDisplayedItems.kt
@@ -7,8 +7,8 @@ import net.minecraft.client.MinecraftClient
 import net.minecraft.client.network.ClientPlayNetworkHandler
 import net.minecraft.network.Packet
 import net.minecraft.network.PacketByteBuf
-import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity
-import net.shadowfacts.phycon.network.block.terminal.TerminalScreenHandler
+import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
+import net.shadowfacts.phycon.block.terminal.TerminalScreenHandler
 import net.shadowfacts.phycon.util.SortMode
 
 /**
@@ -54,4 +54,4 @@ object S2CTerminalUpdateDisplayedItems: ClientReceiver {
 			screenHandler.receivedUpdatedItemsFromServer(entries, query, sortMode)
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/BasePacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/BasePacket.kt
similarity index 87%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/BasePacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/BasePacket.kt
index 04147c4..3b8c253 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/BasePacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/BasePacket.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.shadowfacts.phycon.api.packet.Packet
 import net.shadowfacts.phycon.api.util.IPAddress
@@ -14,4 +14,4 @@ abstract class BasePacket(
 	override fun getSource() = source
 	override fun getDestination() = destination
 
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/CapacityPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/CapacityPacket.kt
similarity index 72%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/CapacityPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/CapacityPacket.kt
index b62dc29..bad14f3 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/CapacityPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/CapacityPacket.kt
@@ -1,8 +1,8 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.minecraft.item.ItemStack
 import net.shadowfacts.phycon.api.util.IPAddress
-import net.shadowfacts.phycon.network.component.NetworkStackReceiver
+import net.shadowfacts.phycon.component.NetworkStackReceiver
 
 /**
  * @author shadowfacts
@@ -14,4 +14,4 @@ class CapacityPacket(
 	source: IPAddress,
 	destination: IPAddress
 ): BasePacket(source, destination) {
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/CheckCapacityPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/CheckCapacityPacket.kt
similarity index 83%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/CheckCapacityPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/CheckCapacityPacket.kt
index 924c130..eac4bc9 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/CheckCapacityPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/CheckCapacityPacket.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.minecraft.item.ItemStack
 import net.shadowfacts.phycon.api.util.IPAddress
@@ -7,4 +7,4 @@ import net.shadowfacts.phycon.api.util.IPAddress
  * @author shadowfacts
  */
 class CheckCapacityPacket(val stack: ItemStack, source: IPAddress, destination: IPAddress): BasePacket(source, destination) {
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/DeviceRemovedPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/DeviceRemovedPacket.kt
similarity index 72%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/DeviceRemovedPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/DeviceRemovedPacket.kt
index 8a5f61d..14df537 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/DeviceRemovedPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/DeviceRemovedPacket.kt
@@ -1,7 +1,7 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.shadowfacts.phycon.api.util.IPAddress
-import net.shadowfacts.phycon.network.DeviceBlockEntity
+import net.shadowfacts.phycon.block.DeviceBlockEntity
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/ExtractStackPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/ExtractStackPacket.kt
similarity index 85%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/ExtractStackPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/ExtractStackPacket.kt
index 8b8e748..d855717 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/ExtractStackPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/ExtractStackPacket.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.minecraft.item.ItemStack
 import net.shadowfacts.phycon.api.util.IPAddress
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/ItemStackPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/ItemStackPacket.kt
similarity index 89%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/ItemStackPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/ItemStackPacket.kt
index 67f03dd..025c980 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/ItemStackPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/ItemStackPacket.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.minecraft.item.ItemStack
 import net.shadowfacts.phycon.api.util.IPAddress
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/LocateStackPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/LocateStackPacket.kt
similarity index 85%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/LocateStackPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/LocateStackPacket.kt
index 69bdeae..16cdf34 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/LocateStackPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/LocateStackPacket.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.minecraft.item.ItemStack
 import net.shadowfacts.phycon.api.util.IPAddress
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/ReadInventoryPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/ReadInventoryPacket.kt
similarity index 85%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/ReadInventoryPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/ReadInventoryPacket.kt
index bd12bb7..107c02c 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/ReadInventoryPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/ReadInventoryPacket.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import alexiil.mc.lib.attributes.item.GroupedItemInvView
 import net.shadowfacts.phycon.api.util.IPAddress
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/RemoteActivationPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/RemoteActivationPacket.kt
similarity index 84%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/RemoteActivationPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/RemoteActivationPacket.kt
index 4a92ba8..d5c28d6 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/RemoteActivationPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/RemoteActivationPacket.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.shadowfacts.phycon.api.util.IPAddress
 
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/RequestInventoryPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/RequestInventoryPacket.kt
similarity index 81%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/RequestInventoryPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/RequestInventoryPacket.kt
index 64b3a3a..9893eaf 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/RequestInventoryPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/RequestInventoryPacket.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.shadowfacts.phycon.api.util.IPAddress
 
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/packet/StackLocationPacket.kt b/src/main/kotlin/net/shadowfacts/phycon/packet/StackLocationPacket.kt
similarity index 75%
rename from src/main/kotlin/net/shadowfacts/phycon/network/packet/StackLocationPacket.kt
rename to src/main/kotlin/net/shadowfacts/phycon/packet/StackLocationPacket.kt
index a7e08f4..a6a4371 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/packet/StackLocationPacket.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/packet/StackLocationPacket.kt
@@ -1,8 +1,8 @@
-package net.shadowfacts.phycon.network.packet
+package net.shadowfacts.phycon.packet
 
 import net.minecraft.item.ItemStack
 import net.shadowfacts.phycon.api.util.IPAddress
-import net.shadowfacts.phycon.network.component.NetworkStackProvider
+import net.shadowfacts.phycon.component.NetworkStackProvider
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/ActivatableDeviceViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/screen/console/ActivatableDeviceViewController.kt
index 6af152b..c13f0bc 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/ActivatableDeviceViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/screen/console/ActivatableDeviceViewController.kt
@@ -2,15 +2,13 @@ package net.shadowfacts.phycon.screen.console
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.text.TranslatableText
-import net.shadowfacts.cacao.geometry.Axis
 import net.shadowfacts.cacao.util.Color
 import net.shadowfacts.cacao.view.Label
-import net.shadowfacts.cacao.view.StackView
 import net.shadowfacts.cacao.view.button.EnumButton
 import net.shadowfacts.cacao.viewcontroller.ViewController
 import net.shadowfacts.kiwidsl.dsl
-import net.shadowfacts.phycon.network.DeviceBlockEntity
-import net.shadowfacts.phycon.network.component.ActivationController
+import net.shadowfacts.phycon.block.DeviceBlockEntity
+import net.shadowfacts.phycon.component.ActivationController
 import net.shadowfacts.phycon.networking.C2SConfigureActivationMode
 import net.shadowfacts.phycon.util.ActivationMode
 
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt b/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt
index ee0c3be..8025675 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt
@@ -12,9 +12,9 @@ import net.shadowfacts.cacao.viewcontroller.TabViewController
 import net.shadowfacts.cacao.viewcontroller.ViewController
 import net.shadowfacts.cacao.window.Window
 import net.shadowfacts.kiwidsl.dsl
-import net.shadowfacts.phycon.network.DeviceBlockEntity
-import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlockEntity
-import net.shadowfacts.phycon.network.component.ActivationController
+import net.shadowfacts.phycon.block.DeviceBlockEntity
+import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlockEntity
+import net.shadowfacts.phycon.component.ActivationController
 import org.lwjgl.glfw.GLFW
 
 /**
@@ -44,7 +44,8 @@ class DeviceConsoleScreen(
 			))
 		}
 		if (device is RedstoneControllerBlockEntity) {
-			tabs.add(TabViewController.SimpleTab(
+			tabs.add(
+				TabViewController.SimpleTab(
 				TextureView(Texture(Identifier("textures/block/redstone_torch.png"), 0, 0, 16, 16)).apply {
 					intrinsicContentSize = Size(16.0, 16.0)
 				},
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceDetailsViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceDetailsViewController.kt
index ab54834..4c6765a 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceDetailsViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceDetailsViewController.kt
@@ -7,7 +7,7 @@ import net.shadowfacts.cacao.view.Label
 import net.shadowfacts.cacao.view.StackView
 import net.shadowfacts.cacao.viewcontroller.ViewController
 import net.shadowfacts.kiwidsl.dsl
-import net.shadowfacts.phycon.network.DeviceBlockEntity
+import net.shadowfacts.phycon.block.DeviceBlockEntity
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneControllerViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneControllerViewController.kt
index 0b24f9b..23397d8 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneControllerViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneControllerViewController.kt
@@ -11,7 +11,7 @@ import net.shadowfacts.cacao.view.textfield.TextField
 import net.shadowfacts.cacao.viewcontroller.ViewController
 import net.shadowfacts.kiwidsl.dsl
 import net.shadowfacts.phycon.api.util.IPAddress
-import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlockEntity
+import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlockEntity
 import net.shadowfacts.phycon.networking.C2SConfigureRedstoneController
 import net.shadowfacts.phycon.util.RedstoneMode
 
diff --git a/src/main/kotlin/net/shadowfacts/phycon/network/NetworkUtil.kt b/src/main/kotlin/net/shadowfacts/phycon/util/NetworkUtil.kt
similarity index 98%
rename from src/main/kotlin/net/shadowfacts/phycon/network/NetworkUtil.kt
rename to src/main/kotlin/net/shadowfacts/phycon/util/NetworkUtil.kt
index bf162c0..b765684 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/network/NetworkUtil.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/util/NetworkUtil.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.network
+package net.shadowfacts.phycon.util
 
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction