diff --git a/parabotv2/src/org/parabot/Landing.java b/parabotv2/src/org/parabot/Landing.java
index 6c26cf9..069e0fa 100644
--- a/parabotv2/src/org/parabot/Landing.java
+++ b/parabotv2/src/org/parabot/Landing.java
@@ -5,11 +5,11 @@ import java.io.IOException;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
-import org.matt123337.proxy.ProxySocket;
-import org.matt123337.proxy.ProxyType;
 import org.parabot.core.Core;
 import org.parabot.core.Directories;
 import org.parabot.core.forum.AccountManager;
+import org.parabot.core.proxy.ProxySocket;
+import org.parabot.core.proxy.ProxyType;
 import org.parabot.core.ui.LoginUI;
 import org.parabot.core.ui.ServerSelector;
 import org.parabot.core.ui.utils.UILog;
diff --git a/parabotv2/src/org/parabot/core/classpath/ClassPath.java b/parabotv2/src/org/parabot/core/classpath/ClassPath.java
index d58cdd4..6152578 100644
--- a/parabotv2/src/org/parabot/core/classpath/ClassPath.java
+++ b/parabotv2/src/org/parabot/core/classpath/ClassPath.java
@@ -18,7 +18,6 @@ import java.util.jar.JarOutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.matt123337.proxy.ClassRemapper;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.commons.RemappingClassAdapter;
@@ -26,6 +25,7 @@ import org.objectweb.asm.tree.ClassNode;
 import org.parabot.core.Directories;
 import org.parabot.core.build.BuildPath;
 import org.parabot.core.io.SizeInputStream;
+import org.parabot.core.proxy.ClassRemapper;
 import org.parabot.core.ui.components.VerboseLoader;
 
 /**
diff --git a/parabotv2/src/org/matt123337/proxy/ClassRemapper.java b/parabotv2/src/org/parabot/core/proxy/ClassRemapper.java
similarity index 94%
rename from parabotv2/src/org/matt123337/proxy/ClassRemapper.java
rename to parabotv2/src/org/parabot/core/proxy/ClassRemapper.java
index 61f3a9f..a297640 100644
--- a/parabotv2/src/org/matt123337/proxy/ClassRemapper.java
+++ b/parabotv2/src/org/parabot/core/proxy/ClassRemapper.java
@@ -1,4 +1,4 @@
-package org.matt123337.proxy;
+package org.parabot.core.proxy;
 
 import java.util.HashMap;
 
diff --git a/parabotv2/src/org/matt123337/proxy/ProxySocket.java b/parabotv2/src/org/parabot/core/proxy/ProxySocket.java
similarity index 99%
rename from parabotv2/src/org/matt123337/proxy/ProxySocket.java
rename to parabotv2/src/org/parabot/core/proxy/ProxySocket.java
index df6f531..03c9149 100644
--- a/parabotv2/src/org/matt123337/proxy/ProxySocket.java
+++ b/parabotv2/src/org/parabot/core/proxy/ProxySocket.java
@@ -1,4 +1,4 @@
-package org.matt123337.proxy;
+package org.parabot.core.proxy;
 
 import java.io.BufferedReader;
 import java.io.DataInputStream;
diff --git a/parabotv2/src/org/matt123337/proxy/ProxyType.java b/parabotv2/src/org/parabot/core/proxy/ProxyType.java
similarity index 59%
rename from parabotv2/src/org/matt123337/proxy/ProxyType.java
rename to parabotv2/src/org/parabot/core/proxy/ProxyType.java
index d954f7b..ac6a8c2 100644
--- a/parabotv2/src/org/matt123337/proxy/ProxyType.java
+++ b/parabotv2/src/org/parabot/core/proxy/ProxyType.java
@@ -1,4 +1,4 @@
-package org.matt123337.proxy;
+package org.parabot.core.proxy;
 
 public enum ProxyType {
 	SOCKS5,SOCKS4,HTTP
diff --git a/parabotv2/src/org/matt123337/spoofer/NetworkInterface.java b/parabotv2/src/org/parabot/core/spoofer/NetworkInterface.java
similarity index 96%
rename from parabotv2/src/org/matt123337/spoofer/NetworkInterface.java
rename to parabotv2/src/org/parabot/core/spoofer/NetworkInterface.java
index e07dac3..3b441c0 100644
--- a/parabotv2/src/org/matt123337/spoofer/NetworkInterface.java
+++ b/parabotv2/src/org/parabot/core/spoofer/NetworkInterface.java
@@ -1,4 +1,4 @@
-package org.matt123337.spoofer;
+package org.parabot.core.spoofer;
 
 import java.net.InetAddress;
 import java.net.SocketException;
diff --git a/parabotv2/src/org/matt123337/spoofer/Runtime.java b/parabotv2/src/org/parabot/core/spoofer/Runtime.java
similarity index 97%
rename from parabotv2/src/org/matt123337/spoofer/Runtime.java
rename to parabotv2/src/org/parabot/core/spoofer/Runtime.java
index 3439042..6def902 100644
--- a/parabotv2/src/org/matt123337/spoofer/Runtime.java
+++ b/parabotv2/src/org/parabot/core/spoofer/Runtime.java
@@ -1,4 +1,4 @@
-package org.matt123337.spoofer;
+package org.parabot.core.spoofer;
 
 import java.io.IOException;
 
diff --git a/parabotv2/src/org/parabot/core/ui/NetworkUI.java b/parabotv2/src/org/parabot/core/ui/NetworkUI.java
index a49da70..a465de6 100644
--- a/parabotv2/src/org/parabot/core/ui/NetworkUI.java
+++ b/parabotv2/src/org/parabot/core/ui/NetworkUI.java
@@ -25,9 +25,9 @@ import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.PlainDocument;
 
-import org.matt123337.proxy.ProxySocket;
-import org.matt123337.proxy.ProxyType;
-import org.matt123337.spoofer.NetworkInterface;
+import org.parabot.core.proxy.ProxySocket;
+import org.parabot.core.proxy.ProxyType;
+import org.parabot.core.spoofer.NetworkInterface;
 import org.parabot.core.ui.components.LogArea;
 import org.parabot.core.ui.utils.UILog;