diff --git a/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt b/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt
index c71cf9b..e0c7b4c 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/WrenchApp.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
-import xyz.atnrch.wrench.components.filemanager.WrenchScaffold
+import xyz.atnrch.wrench.components.WrenchScaffold
 import xyz.atnrch.wrench.logger.Logger
 import javax.swing.UIManager
 
diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt
new file mode 100644
index 0000000..f43e230
--- /dev/null
+++ b/src/main/kotlin/xyz/atnrch/wrench/components/WatcherDisplay.kt
@@ -0,0 +1,47 @@
+package xyz.atnrch.wrench.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material.Tab
+import androidx.compose.material.TabRow
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.window.WindowState
+import xyz.atnrch.wrench.components.filemanager.FileManagerDisplay
+import xyz.atnrch.wrench.ui.UIColors
+import xyz.atnrch.wrench.watcher.WatcherManager
+import java.nio.file.Path
+
+@Composable
+fun WatcherDisplay(
+    state: WindowState,
+    watcherManager: WatcherManager,
+    currentClick: Int,
+    outputs: MutableList<Path>,
+    onEntryClick: (id: Int) -> Unit,
+    tabIndex: Int,
+    tabTitles: List<String>,
+    onTabChange: (id: Int) -> Unit
+) {
+
+    Column {
+        TabRow(
+            selectedTabIndex = tabIndex,
+            backgroundColor = UIColors.ORANGE,
+            contentColor = Color.White
+        ) {
+            tabTitles.forEachIndexed { index, title ->
+                Tab(selected = tabIndex == index,
+                    onClick = { onTabChange(index) },
+                    text = { Text(text = title) })
+            }
+        }
+        when (tabIndex) {
+            0 -> FileManagerDisplay(state, watcherManager, currentClick, outputs, onEntryClick)
+            1 -> Text(
+                color = Color.White,
+                text = "Hello!"
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WrenchScaffold.kt b/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt
similarity index 97%
rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WrenchScaffold.kt
rename to src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt
index 1d57036..a5802ee 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WrenchScaffold.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/components/WrenchScaffold.kt
@@ -1,4 +1,4 @@
-package xyz.atnrch.wrench.components.filemanager
+package xyz.atnrch.wrench.components
 
 import androidx.compose.material.Scaffold
 import androidx.compose.material.ScaffoldState
diff --git a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WatcherDisplay.kt b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt
similarity index 66%
rename from src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WatcherDisplay.kt
rename to src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt
index 40fe35e..96c9a16 100644
--- a/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/WatcherDisplay.kt
+++ b/src/main/kotlin/xyz/atnrch/wrench/components/filemanager/FileManagerDisplay.kt
@@ -4,53 +4,17 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Tab
-import androidx.compose.material.TabRow
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.WindowState
 import xyz.atnrch.wrench.components.filemanager.center.empty.DefaultDisplay
 import xyz.atnrch.wrench.components.filemanager.center.input.InputEntries
 import xyz.atnrch.wrench.components.filemanager.center.output.OutputEntries
-import xyz.atnrch.wrench.ui.UIColors
 import xyz.atnrch.wrench.watcher.WatcherManager
 import java.nio.file.Path
 
-@Composable
-fun WatcherDisplay(
-    state: WindowState,
-    watcherManager: WatcherManager,
-    currentClick: Int,
-    outputs: MutableList<Path>,
-    onEntryClick: (id: Int) -> Unit,
-    tabIndex: Int,
-    tabTitles: List<String>,
-    onTabChange: (id: Int) -> Unit
-) {
-
-    Column {
-        TabRow(
-            selectedTabIndex = tabIndex,
-            backgroundColor = UIColors.ORANGE,
-            contentColor = Color.White
-        ) {
-            tabTitles.forEachIndexed { index, title ->
-                Tab(selected = tabIndex == index,
-                    onClick = { onTabChange(index) },
-                    text = { Text(text = title) })
-            }
-        }
-        when (tabIndex) {
-            0 -> FileManagerDisplay(state, watcherManager, currentClick, outputs, onEntryClick)
-            1 -> TODO("Add Server Manager")
-        }
-    }
-}
-
 @Composable
 fun FileManagerDisplay(
     state: WindowState,
@@ -93,4 +57,4 @@ fun DisplayEntries(
         InputEntries(minmode, watcherManager, onEntryClick)
         OutputEntries(minmode, watcherManager, currentClick, outputs)
     }
-}
+}
\ No newline at end of file