diff --git a/src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlock.kt b/src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlock.kt
similarity index 97%
rename from src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlock.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlock.kt
index 86f272f..eb95702 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlock.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlock.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.block.redstone
+package net.shadowfacts.phycon.block.redstone_controller
 
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
diff --git a/src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlockEntity.kt b/src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlockEntity.kt
similarity index 97%
rename from src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlockEntity.kt
rename to src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlockEntity.kt
index 03397b3..384d42e 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlockEntity.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/block/redstone_controller/RedstoneControllerBlockEntity.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.block.redstone
+package net.shadowfacts.phycon.block.redstone_controller
 
 import net.minecraft.block.BlockState
 import net.minecraft.nbt.CompoundTag
diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlockEntities.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlockEntities.kt
index ad659a5..3ddb63b 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlockEntities.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlockEntities.kt
@@ -15,8 +15,8 @@ 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.redstone_controller.RedstoneControllerBlock
+import net.shadowfacts.phycon.block.redstone_controller.RedstoneControllerBlockEntity
 import net.shadowfacts.phycon.block.terminal.TerminalBlock
 import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
 
diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt
index 48cd5b1..da7a0ec 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt
@@ -9,7 +9,7 @@ import net.shadowfacts.phycon.block.inserter.InserterBlock
 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.redstone_controller.RedstoneControllerBlock
 import net.shadowfacts.phycon.block.terminal.TerminalBlock
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
index 4d0e15f..49eebf2 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
@@ -12,7 +12,7 @@ import net.shadowfacts.phycon.block.inserter.InserterBlock
 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.redstone_controller.RedstoneControllerBlock
 import net.shadowfacts.phycon.block.terminal.TerminalBlock
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureRedstoneController.kt b/src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureRedstoneController.kt
index b4398ae..9de71d9 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.block.redstone.RedstoneControllerBlockEntity
+import net.shadowfacts.phycon.block.redstone_controller.RedstoneControllerBlockEntity
 import net.shadowfacts.phycon.util.RedstoneMode
 
 /**
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 8025675..8456087 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt
@@ -13,7 +13,7 @@ import net.shadowfacts.cacao.viewcontroller.ViewController
 import net.shadowfacts.cacao.window.Window
 import net.shadowfacts.kiwidsl.dsl
 import net.shadowfacts.phycon.block.DeviceBlockEntity
-import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlockEntity
+import net.shadowfacts.phycon.block.redstone_controller.RedstoneControllerBlockEntity
 import net.shadowfacts.phycon.component.ActivationController
 import org.lwjgl.glfw.GLFW
 
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 23397d8..1eaf55b 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.block.redstone.RedstoneControllerBlockEntity
+import net.shadowfacts.phycon.block.redstone_controller.RedstoneControllerBlockEntity
 import net.shadowfacts.phycon.networking.C2SConfigureRedstoneController
 import net.shadowfacts.phycon.util.RedstoneMode