diff --git a/src/main/java/org/toop/Main.java b/src/main/java/org/toop/Main.java
index 136ab9b..c389d8c 100644
--- a/src/main/java/org/toop/Main.java
+++ b/src/main/java/org/toop/Main.java
@@ -1,18 +1,15 @@
 package org.toop;
 
-import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.function.Supplier;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.backend.ServerManager;
+import org.toop.backend.tictactoe.ServerManager;
 import org.toop.eventbus.EventPublisher;
 import org.toop.eventbus.EventRegistry;
 import org.toop.eventbus.events.Events;
 import org.toop.eventbus.GlobalEventBus;
-import org.toop.eventbus.events.NetworkEvents;
 import org.toop.frontend.UI.LocalServerSelector;
 import org.toop.frontend.networking.NetworkingClientManager;
 
diff --git a/src/main/java/org/toop/backend/ServerManager.java b/src/main/java/org/toop/backend/tictactoe/ServerManager.java
similarity index 97%
rename from src/main/java/org/toop/backend/ServerManager.java
rename to src/main/java/org/toop/backend/tictactoe/ServerManager.java
index 4aabc06..2290139 100644
--- a/src/main/java/org/toop/backend/ServerManager.java
+++ b/src/main/java/org/toop/backend/tictactoe/ServerManager.java
@@ -1,4 +1,4 @@
-package org.toop.backend;
+package org.toop.backend.tictactoe;
 
 import java.util.ArrayList;
 import java.util.Map;
@@ -7,10 +7,8 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.backend.tictactoe.TicTacToeServer;
 import org.toop.eventbus.EventPublisher;
 import org.toop.eventbus.events.Events;
-import org.toop.eventbus.GlobalEventBus;
 
 // TODO more methods.
 
diff --git a/src/main/java/org/toop/backend/TcpServer.java b/src/main/java/org/toop/backend/tictactoe/TcpServer.java
similarity index 99%
rename from src/main/java/org/toop/backend/TcpServer.java
rename to src/main/java/org/toop/backend/tictactoe/TcpServer.java
index 8955ff0..5422ef9 100644
--- a/src/main/java/org/toop/backend/TcpServer.java
+++ b/src/main/java/org/toop/backend/tictactoe/TcpServer.java
@@ -1,4 +1,4 @@
-package org.toop.backend;
+package org.toop.backend.tictactoe;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -10,7 +10,6 @@ import java.util.Map;
 import java.util.concurrent.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.backend.tictactoe.ParsedCommand;
 
 /**
  * Lightweight, thread-pool based TCP server base class.
diff --git a/src/main/java/org/toop/backend/tictactoe/TicTacToeServer.java b/src/main/java/org/toop/backend/tictactoe/TicTacToeServer.java
index 0094567..f937d4f 100644
--- a/src/main/java/org/toop/backend/tictactoe/TicTacToeServer.java
+++ b/src/main/java/org/toop/backend/tictactoe/TicTacToeServer.java
@@ -7,7 +7,6 @@ import java.util.UUID;
 import java.util.concurrent.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.toop.backend.TcpServer;
 import org.toop.game.tictactoe.TicTacToe;
 
 public class TicTacToeServer extends TcpServer {
diff --git a/src/test/java/org/toop/backend/TcpServerTest.java b/src/test/java/org/toop/backend/TcpServerTest.java
index 7fdcfcd..512850e 100644
--- a/src/test/java/org/toop/backend/TcpServerTest.java
+++ b/src/test/java/org/toop/backend/TcpServerTest.java
@@ -6,6 +6,7 @@ import java.io.*;
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.*;
+import org.toop.backend.tictactoe.TcpServer;
 
 class TcpServerTest {