25 files changed, 123 insertions, 66 deletions

diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java b/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java
new file mode 100644
index 00000000..720744bf
--- /dev/null
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java
@@ -0,0 +1,29 @@
+package cuchaz.enigma.network;
+
+import cuchaz.enigma.analysis.EntryReference;
+import cuchaz.enigma.translation.mapping.EntryMapping;
+import cuchaz.enigma.translation.mapping.tree.EntryTree;
+import cuchaz.enigma.network.packet.Packet;
+import cuchaz.enigma.translation.representation.entry.Entry;
+
+import java.util.List;
+
+public interface ClientPacketHandler {
+    void openMappings(EntryTree<EntryMapping> mappings);
+
+    void rename(EntryReference<Entry<?>, Entry<?>> reference, String newName, boolean refreshClassTree, boolean jumpToReference);
+
+    void removeMapping(EntryReference<Entry<?>, Entry<?>> reference, boolean jumpToReference);
+
+    void changeDocs(EntryReference<Entry<?>, Entry<?>> reference, String updatedDocs, boolean jumpToReference);
+
+    void markAsDeobfuscated(EntryReference<Entry<?>, Entry<?>> reference, boolean jumpToReference);
+
+    void disconnectIfConnected(String reason);
+
+    void sendPacket(Packet<ServerPacketHandler> packet);
+
+    void addMessage(Message message);
+
+    void updateUserList(List<String> users);
+}
diff --git a/src/main/java/cuchaz/enigma/network/DedicatedEnigmaServer.java b/enigma-server/src/main/java/cuchaz/enigma/network/DedicatedEnigmaServer.java
index 2cfe8233..924302f3 100644
--- a/src/main/java/cuchaz/enigma/network/DedicatedEnigmaServer.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/DedicatedEnigmaServer.java
@@ -2,13 +2,14 @@ package cuchaz.enigma.network;
 
 import com.google.common.io.MoreFiles;
 import cuchaz.enigma.*;
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryRemapper;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.utils.Utils;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
+import joptsimple.ValueConverter;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -62,16 +63,16 @@ public class DedicatedEnigmaServer extends EnigmaServer {
                 OptionSpec<Path> jarOpt = parser.accepts("jar", "Jar file to open at startup")
                                 .withRequiredArg()
                                 .required()
-                                .withValuesConvertedBy(Main.PathConverter.INSTANCE);
+                                .withValuesConvertedBy(PathConverter.INSTANCE);
 
                 OptionSpec<Path> mappingsOpt = parser.accepts("mappings", "Mappings file to open at startup")
                                 .withRequiredArg()
                                 .required()
-                                .withValuesConvertedBy(Main.PathConverter.INSTANCE);
+                                .withValuesConvertedBy(PathConverter.INSTANCE);
 
                 OptionSpec<Path> profileOpt = parser.accepts("profile", "Profile json to apply at startup")
                                 .withRequiredArg()
-                                .withValuesConvertedBy(Main.PathConverter.INSTANCE);
+                                .withValuesConvertedBy(PathConverter.INSTANCE);
 
                 OptionSpec<Integer> portOpt = parser.accepts("port", "Port to run the server on")
                                 .withOptionalArg()
@@ -84,7 +85,7 @@ public class DedicatedEnigmaServer extends EnigmaServer {
 
                 OptionSpec<Path> logFileOpt = parser.accepts("log", "The log file to write to")
                                 .withRequiredArg()
-                                .withValuesConvertedBy(Main.PathConverter.INSTANCE)
+                                .withValuesConvertedBy(PathConverter.INSTANCE)
                                 .defaultsTo(Paths.get("log.txt"));
 
                 OptionSet parsedArgs = parser.parse(args);
@@ -161,4 +162,39 @@ public class DedicatedEnigmaServer extends EnigmaServer {
                 mappingFormat.write(getMappings().getObfToDeobf(), getMappings().takeMappingDelta(), mappingsFile, ProgressListener.none(), profile.getMappingSaveParameters());
                 log.flush();
         }
+
+        public static class PathConverter implements ValueConverter<Path> {
+                public static final ValueConverter<Path> INSTANCE = new PathConverter();
+
+                PathConverter() {
+                }
+
+                @Override
+                public Path convert(String path) {
+                        // expand ~ to the home dir
+                        if (path.startsWith("~")) {
+                                // get the home dir
+                                Path dirHome = Paths.get(System.getProperty("user.home"));
+
+                                // is the path just ~/ or is it ~user/ ?
+                                if (path.startsWith("~/")) {
+                                        return dirHome.resolve(path.substring(2));
+                                } else {
+                                        return dirHome.getParent().resolve(path.substring(1));
+                                }
+                        }
+
+                        return Paths.get(path);
+                }
+
+                @Override
+                public Class<? extends Path> valueType() {
+                        return Path.class;
+                }
+
+                @Override
+                public String valuePattern() {
+                        return "path";
+                }
+        }
 }
diff --git a/src/main/java/cuchaz/enigma/network/EnigmaClient.java b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaClient.java
index bfa53d73..71bd011c 100644
--- a/src/main/java/cuchaz/enigma/network/EnigmaClient.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaClient.java
@@ -1,30 +1,23 @@
 package cuchaz.enigma.network;
 
-import cuchaz.enigma.gui.GuiController;
-import cuchaz.enigma.network.packet.LoginC2SPacket;
 import cuchaz.enigma.network.packet.Packet;
 import cuchaz.enigma.network.packet.PacketRegistry;
 
-import javax.swing.SwingUtilities;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
+import javax.swing.*;
+import java.io.*;
 import java.net.Socket;
 import java.net.SocketException;
 
 public class EnigmaClient {
 
-        private final GuiController controller;
+        private final ClientPacketHandler controller;
 
         private final String ip;
         private final int port;
         private Socket socket;
         private DataOutput output;
 
-        public EnigmaClient(GuiController controller, String ip, int port) {
+        public EnigmaClient(ClientPacketHandler controller, String ip, int port) {
                 this.controller = controller;
                 this.ip = ip;
                 this.port = port;
@@ -43,7 +36,7 @@ public class EnigmaClient {
                                         } catch (EOFException | SocketException e) {
                                                 break;
                                         }
-                                        Packet<GuiController> packet = PacketRegistry.createS2CPacket(packetId);
+                                        Packet<ClientPacketHandler> packet = PacketRegistry.createS2CPacket(packetId);
                                         if (packet == null) {
                                                 throw new IOException("Received invalid packet id " + packetId);
                                         }
diff --git a/src/main/java/cuchaz/enigma/network/EnigmaServer.java b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaServer.java
index b0e15a3c..6027a6bd 100644
--- a/src/main/java/cuchaz/enigma/network/EnigmaServer.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/EnigmaServer.java
@@ -1,6 +1,5 @@
 package cuchaz.enigma.network;
 
-import cuchaz.enigma.gui.GuiController;
 import cuchaz.enigma.network.packet.KickS2CPacket;
 import cuchaz.enigma.network.packet.MessageS2CPacket;
 import cuchaz.enigma.network.packet.Packet;
@@ -11,7 +10,6 @@ import cuchaz.enigma.network.packet.UserListS2CPacket;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.EntryRemapper;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
 
 import java.io.DataInput;
 import java.io.DataInputStream;
@@ -175,7 +173,7 @@ public abstract class EnigmaServer {
                 return usernames.get(client);
         }
 
-        public void sendPacket(Socket client, Packet<GuiController> packet) {
+        public void sendPacket(Socket client, Packet<ClientPacketHandler> packet) {
                 if (!client.isClosed()) {
                         int packetId = PacketRegistry.getS2CId(packet);
                         try {
@@ -191,13 +189,13 @@ public abstract class EnigmaServer {
                 }
         }
 
-        public void sendToAll(Packet<GuiController> packet) {
+        public void sendToAll(Packet<ClientPacketHandler> packet) {
                 for (Socket client : clients) {
                         sendPacket(client, packet);
                 }
         }
 
-        public void sendToAllExcept(Socket excluded, Packet<GuiController> packet) {
+        public void sendToAllExcept(Socket excluded, Packet<ClientPacketHandler> packet) {
                 for (Socket client : clients) {
                         if (client != excluded) {
                                 sendPacket(client, packet);
diff --git a/src/main/java/cuchaz/enigma/network/IntegratedEnigmaServer.java b/enigma-server/src/main/java/cuchaz/enigma/network/IntegratedEnigmaServer.java
index 21c6825b..21c6825b 100644
--- a/src/main/java/cuchaz/enigma/network/IntegratedEnigmaServer.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/IntegratedEnigmaServer.java
diff --git a/src/main/java/cuchaz/enigma/utils/Message.java b/enigma-server/src/main/java/cuchaz/enigma/network/Message.java
index d7c5f23e..c1578387 100644
--- a/src/main/java/cuchaz/enigma/utils/Message.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/Message.java
@@ -1,4 +1,4 @@
-package cuchaz.enigma.utils;
+package cuchaz.enigma.network;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -7,6 +7,7 @@ import java.util.Objects;
 
 import cuchaz.enigma.network.packet.PacketHelper;
 import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.utils.I18n;
 
 public abstract class Message {
 
diff --git a/src/main/java/cuchaz/enigma/network/ServerPacketHandler.java b/enigma-server/src/main/java/cuchaz/enigma/network/ServerPacketHandler.java
index 86185536..86185536 100644
--- a/src/main/java/cuchaz/enigma/network/ServerPacketHandler.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/ServerPacketHandler.java
diff --git a/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
index 4d5d86f3..1b52cf14 100644
--- a/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
@@ -1,10 +1,10 @@
 package cuchaz.enigma.network.packet;
 
+import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.network.EnigmaServer;
+import cuchaz.enigma.network.Message;
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
 import cuchaz.enigma.utils.Utils;
 
 import java.io.DataInput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java
index bf5b7cb8..12a30253 100644
--- a/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class ChangeDocsS2CPacket implements Packet<GuiController> {
+public class ChangeDocsS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
         private String newDocs;
@@ -37,7 +37,7 @@ public class ChangeDocsS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.changeDocs(new EntryReference<>(entry, entry.getName()), newDocs, false);
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/ConfirmChangeC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ConfirmChangeC2SPacket.java
index 78ef9645..78ef9645 100644
--- a/src/main/java/cuchaz/enigma/network/packet/ConfirmChangeC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ConfirmChangeC2SPacket.java
diff --git a/src/main/java/cuchaz/enigma/network/packet/KickS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/KickS2CPacket.java
index bd007d31..9a112a80 100644
--- a/src/main/java/cuchaz/enigma/network/packet/KickS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/KickS2CPacket.java
@@ -1,12 +1,12 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class KickS2CPacket implements Packet<GuiController> {
+public class KickS2CPacket implements Packet<ClientPacketHandler> {
         private String reason;
 
         KickS2CPacket() {
@@ -27,7 +27,7 @@ public class KickS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.disconnectIfConnected(reason);
         }
 }
diff --git a/src/main/java/cuchaz/enigma/network/packet/LoginC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/LoginC2SPacket.java
index 722cbbf3..da0f44a5 100644
--- a/src/main/java/cuchaz/enigma/network/packet/LoginC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/LoginC2SPacket.java
@@ -2,7 +2,7 @@ package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java
index 98d20d96..a41c620f 100644
--- a/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java
@@ -3,7 +3,7 @@ package cuchaz.enigma.network.packet;
 import cuchaz.enigma.network.ServerPacketHandler;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java
index b7d6eda3..7504430d 100644
--- a/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class MarkDeobfuscatedS2CPacket implements Packet<GuiController> {
+public class MarkDeobfuscatedS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
 
@@ -33,7 +33,7 @@ public class MarkDeobfuscatedS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.markAsDeobfuscated(new EntryReference<>(entry, entry.getName()), false);
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/MessageC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MessageC2SPacket.java
index b8e0f14f..3bc09e79 100644
--- a/src/main/java/cuchaz/enigma/network/packet/MessageC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MessageC2SPacket.java
@@ -5,7 +5,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 public class MessageC2SPacket implements Packet<ServerPacketHandler> {
 
diff --git a/src/main/java/cuchaz/enigma/network/packet/MessageS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MessageS2CPacket.java
index edeaae0b..2b07968d 100644
--- a/src/main/java/cuchaz/enigma/network/packet/MessageS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MessageS2CPacket.java
@@ -4,10 +4,10 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import cuchaz.enigma.gui.GuiController;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.ClientPacketHandler;
+import cuchaz.enigma.network.Message;
 
-public class MessageS2CPacket implements Packet<GuiController> {
+public class MessageS2CPacket implements Packet<ClientPacketHandler> {
 
         private Message message;
 
@@ -29,7 +29,7 @@ public class MessageS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController handler) {
+        public void handle(ClientPacketHandler handler) {
                 handler.addMessage(message);
         }
 
diff --git a/src/main/java/cuchaz/enigma/network/packet/Packet.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/Packet.java
index 2f16dfb9..2f16dfb9 100644
--- a/src/main/java/cuchaz/enigma/network/packet/Packet.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/Packet.java
diff --git a/src/main/java/cuchaz/enigma/network/packet/PacketHelper.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/PacketHelper.java
index 464606e0..464606e0 100644
--- a/src/main/java/cuchaz/enigma/network/packet/PacketHelper.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/PacketHelper.java
diff --git a/src/main/java/cuchaz/enigma/network/packet/PacketRegistry.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/PacketRegistry.java
index ba5d9dec..3b8af81c 100644
--- a/src/main/java/cuchaz/enigma/network/packet/PacketRegistry.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/PacketRegistry.java
@@ -1,6 +1,6 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.network.ServerPacketHandler;
 
 import java.util.HashMap;
@@ -11,15 +11,15 @@ public class PacketRegistry {
 
         private static final Map<Class<? extends Packet<ServerPacketHandler>>, Integer> c2sPacketIds = new HashMap<>();
         private static final Map<Integer, Supplier<? extends Packet<ServerPacketHandler>>> c2sPacketCreators = new HashMap<>();
-        private static final Map<Class<? extends Packet<GuiController>>, Integer> s2cPacketIds = new HashMap<>();
-        private static final Map<Integer, Supplier<? extends Packet<GuiController>>> s2cPacketCreators = new HashMap<>();
+        private static final Map<Class<? extends Packet<ClientPacketHandler>>, Integer> s2cPacketIds = new HashMap<>();
+        private static final Map<Integer, Supplier<? extends Packet<ClientPacketHandler>>> s2cPacketCreators = new HashMap<>();
 
         private static <T extends Packet<ServerPacketHandler>> void registerC2S(int id, Class<T> clazz, Supplier<T> creator) {
                 c2sPacketIds.put(clazz, id);
                 c2sPacketCreators.put(id, creator);
         }
 
-        private static <T extends Packet<GuiController>> void registerS2C(int id, Class<T> clazz, Supplier<T> creator) {
+        private static <T extends Packet<ClientPacketHandler>> void registerS2C(int id, Class<T> clazz, Supplier<T> creator) {
                 s2cPacketIds.put(clazz, id);
                 s2cPacketCreators.put(id, creator);
         }
@@ -52,12 +52,12 @@ public class PacketRegistry {
                 return creator == null ? null : creator.get();
         }
 
-        public static int getS2CId(Packet<GuiController> packet) {
+        public static int getS2CId(Packet<ClientPacketHandler> packet) {
                 return s2cPacketIds.get(packet.getClass());
         }
 
-        public static Packet<GuiController> createS2CPacket(int id) {
-                Supplier<? extends Packet<GuiController>> creator = s2cPacketCreators.get(id);
+        public static Packet<ClientPacketHandler> createS2CPacket(int id) {
+                Supplier<? extends Packet<ClientPacketHandler>> creator = s2cPacketCreators.get(id);
                 return creator == null ? null : creator.get();
         }
 
diff --git a/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java
index a3f3d91d..3f852285 100644
--- a/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java
@@ -1,9 +1,9 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.throwables.IllegalNameException;
+import cuchaz.enigma.translation.mapping.IllegalNameException;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java
index 7bb1b00d..70d803c1 100644
--- a/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class RemoveMappingS2CPacket implements Packet<GuiController> {
+public class RemoveMappingS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
 
@@ -33,7 +33,7 @@ public class RemoveMappingS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.removeMapping(new EntryReference<>(entry, entry.getName()), false);
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
index 03e95d6f..e3e7e379 100644
--- a/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
@@ -1,10 +1,10 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.throwables.IllegalNameException;
+import cuchaz.enigma.translation.mapping.IllegalNameException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.utils.Message;
+import cuchaz.enigma.network.Message;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java
index 058f0e58..787e89e6 100644
--- a/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.network.ClientPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-public class RenameS2CPacket implements Packet<GuiController> {
+public class RenameS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
         private String newName;
@@ -41,7 +41,7 @@ public class RenameS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.rename(new EntryReference<>(entry, entry.getName()), newName, refreshClassTree, false);
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java
index e6378d1d..76ecbc7d 100644
--- a/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/SyncMappingsS2CPacket.java
@@ -1,11 +1,11 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.gui.GuiController;
-import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
+import cuchaz.enigma.network.ClientPacketHandler;
+import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.DataInput;
@@ -15,7 +15,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class SyncMappingsS2CPacket implements Packet<GuiController> {
+public class SyncMappingsS2CPacket implements Packet<ClientPacketHandler> {
         private EntryTree<EntryMapping> mappings;
 
         SyncMappingsS2CPacket() {
@@ -81,7 +81,7 @@ public class SyncMappingsS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController controller) {
+        public void handle(ClientPacketHandler controller) {
                 controller.openMappings(mappings);
                 controller.sendPacket(new ConfirmChangeC2SPacket(EnigmaServer.DUMMY_SYNC_ID));
         }
diff --git a/src/main/java/cuchaz/enigma/network/packet/UserListS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/UserListS2CPacket.java
index 89048485..b4a277a4 100644
--- a/src/main/java/cuchaz/enigma/network/packet/UserListS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/UserListS2CPacket.java
@@ -1,14 +1,14 @@
 package cuchaz.enigma.network.packet;
 
+import cuchaz.enigma.network.ClientPacketHandler;
+
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import cuchaz.enigma.gui.GuiController;
-
-public class UserListS2CPacket implements Packet<GuiController> {
+public class UserListS2CPacket implements Packet<ClientPacketHandler> {
 
         private List<String> users;
 
@@ -37,7 +37,7 @@ public class UserListS2CPacket implements Packet<GuiController> {
         }
 
         @Override
-        public void handle(GuiController handler) {
+        public void handle(ClientPacketHandler handler) {
                 handler.updateUserList(users);
         }