diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/ClipboardButton.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/ClipboardButton.kt
similarity index 96%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/ClipboardButton.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/ClipboardButton.kt
index b519cab..738271a 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/ClipboardButton.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/ClipboardButton.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.screen
+package net.shadowfacts.phycon.client.screen
 
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.util.Identifier
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/EnumButton.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/EnumButton.kt
similarity index 94%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/EnumButton.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/EnumButton.kt
index 79e2608..3c800b9 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/EnumButton.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/EnumButton.kt
@@ -1,7 +1,6 @@
-package net.shadowfacts.phycon.screen
+package net.shadowfacts.phycon.client.screen
 
 import net.minecraft.client.gui.widget.AbstractPressableButtonWidget
-import net.minecraft.text.Text
 import net.shadowfacts.phycon.util.FriendlyNameable
 import net.shadowfacts.phycon.util.RotatableEnum
 import net.shadowfacts.phycon.util.next
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/TestCacaoScreen.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/TestCacaoScreen.kt
similarity index 89%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/TestCacaoScreen.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/TestCacaoScreen.kt
index ecfe695..db04eed 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/TestCacaoScreen.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/TestCacaoScreen.kt
@@ -1,19 +1,11 @@
-package net.shadowfacts.phycon.screen
+package net.shadowfacts.phycon.client.screen
 
-import net.minecraft.client.MinecraftClient
 import net.minecraft.text.LiteralText
 import net.minecraft.text.Text
-import net.minecraft.util.Identifier
 import net.shadowfacts.cacao.CacaoScreen
 import net.shadowfacts.cacao.window.Window
-import net.shadowfacts.cacao.geometry.Axis
-import net.shadowfacts.cacao.geometry.Size
-import net.shadowfacts.cacao.util.Color
-import net.shadowfacts.cacao.util.texture.NinePatchTexture
-import net.shadowfacts.cacao.util.texture.Texture
 import net.shadowfacts.cacao.view.*
 import net.shadowfacts.cacao.view.button.Button
-import net.shadowfacts.cacao.view.textfield.TextField
 import net.shadowfacts.cacao.viewcontroller.TabViewController
 import net.shadowfacts.cacao.viewcontroller.ViewController
 import net.shadowfacts.kiwidsl.dsl
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/ActivatableDeviceViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/ActivatableDeviceViewController.kt
similarity index 96%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/console/ActivatableDeviceViewController.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/console/ActivatableDeviceViewController.kt
index 60cdbc8..78758b1 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/ActivatableDeviceViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/ActivatableDeviceViewController.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.screen.console
+package net.shadowfacts.phycon.client.screen.console
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.text.TranslatableText
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/DeviceConsoleScreen.kt
similarity index 98%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/console/DeviceConsoleScreen.kt
index 2b685f3..04ab2ba 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/DeviceConsoleScreen.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.screen.console
+package net.shadowfacts.phycon.client.screen.console
 
 import net.minecraft.text.TranslatableText
 import net.minecraft.util.Identifier
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceDetailsViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/DeviceDetailsViewController.kt
similarity index 93%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceDetailsViewController.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/console/DeviceDetailsViewController.kt
index b625752..945b8e6 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceDetailsViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/DeviceDetailsViewController.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.screen.console
+package net.shadowfacts.phycon.client.screen.console
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.text.TranslatableText
@@ -6,11 +6,10 @@ 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.View
 import net.shadowfacts.cacao.viewcontroller.ViewController
 import net.shadowfacts.kiwidsl.dsl
 import net.shadowfacts.phycon.block.DeviceBlockEntity
-import net.shadowfacts.phycon.screen.ClipboardButton
+import net.shadowfacts.phycon.client.screen.ClipboardButton
 
 /**
  * @author shadowfacts
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/MinerViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/MinerViewController.kt
similarity index 96%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/console/MinerViewController.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/console/MinerViewController.kt
index 337051c..f5a253c 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/MinerViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/MinerViewController.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.screen.console
+package net.shadowfacts.phycon.client.screen.console
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.text.TranslatableText
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/ProviderViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/ProviderViewController.kt
similarity index 94%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/console/ProviderViewController.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/console/ProviderViewController.kt
index d133859..03570a1 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/ProviderViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/ProviderViewController.kt
@@ -1,13 +1,10 @@
-package net.shadowfacts.phycon.screen.console
+package net.shadowfacts.phycon.client.screen.console
 
 import net.minecraft.block.entity.BlockEntity
 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.View
 import net.shadowfacts.cacao.view.button.ToggleButton
 import net.shadowfacts.cacao.view.textfield.NumberField
 import net.shadowfacts.cacao.viewcontroller.ViewController
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/ReceiverViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/ReceiverViewController.kt
similarity index 98%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/console/ReceiverViewController.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/console/ReceiverViewController.kt
index 9071d99..bbee9bf 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/ReceiverViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/ReceiverViewController.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.screen.console
+package net.shadowfacts.phycon.client.screen.console
 
 import net.minecraft.block.entity.BlockEntity
 import net.minecraft.client.MinecraftClient
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneControllerViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/RedstoneControllerViewController.kt
similarity index 97%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneControllerViewController.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/console/RedstoneControllerViewController.kt
index 70c710e..0579421 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneControllerViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/RedstoneControllerViewController.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.screen.console
+package net.shadowfacts.phycon.client.screen.console
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.text.TranslatableText
diff --git a/src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneEmitterViewController.kt b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/RedstoneEmitterViewController.kt
similarity index 96%
rename from src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneEmitterViewController.kt
rename to src/main/kotlin/net/shadowfacts/phycon/client/screen/console/RedstoneEmitterViewController.kt
index a988726..6631357 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneEmitterViewController.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/client/screen/console/RedstoneEmitterViewController.kt
@@ -1,4 +1,4 @@
-package net.shadowfacts.phycon.screen.console
+package net.shadowfacts.phycon.client.screen.console
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.text.TranslatableText
diff --git a/src/main/kotlin/net/shadowfacts/phycon/item/ConsoleItem.kt b/src/main/kotlin/net/shadowfacts/phycon/item/ConsoleItem.kt
index 549ec20..be072ab 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/item/ConsoleItem.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/item/ConsoleItem.kt
@@ -8,7 +8,7 @@ import net.minecraft.util.Identifier
 import net.shadowfacts.phycon.PhysicalConnectivity
 import net.shadowfacts.phycon.block.DeviceBlock
 import net.shadowfacts.phycon.block.DeviceBlockEntity
-import net.shadowfacts.phycon.screen.console.DeviceConsoleScreen
+import net.shadowfacts.phycon.client.screen.console.DeviceConsoleScreen
 
 /**
  * @author shadowfacts