diff --git a/server/src/main/java/net/minecraft/server/MinecraftServer.java b/server/src/main/java/net/minecraft/server/MinecraftServer.java
index 1ae1160..74dd07e 100644
--- a/server/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/server/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -29,12 +29,12 @@ import net.minecraft.src.NetworkListenThread;
 import ru.di9.minecraft.shared.network.Packet;
 import ru.di9.minecraft.shared.network.Packet4UpdateTime;
 import net.minecraft.src.PropertyManager;
-import net.minecraft.src.RConConsoleSource;
-import net.minecraft.src.RConThreadMain;
-import net.minecraft.src.RConThreadQuery;
+import net.minecraft.server.rcon.RConConsoleSource;
+import net.minecraft.server.rcon.RConThreadMain;
+import net.minecraft.server.rcon.RConThreadQuery;
 import net.minecraft.src.ServerCommand;
 import net.minecraft.src.ServerConfigurationManager;
-import net.minecraft.src.ServerGUI;
+import net.minecraft.server.gui.ServerGUI;
 import ru.di9.minecraft.shared.StatList;
 import net.minecraft.src.ThreadCommandReader;
 import net.minecraft.src.ThreadServerApplication;
diff --git a/server/src/main/java/net/minecraft/src/GuiLogFormatter.java b/server/src/main/java/net/minecraft/server/gui/GuiLogFormatter.java
similarity index 98%
rename from server/src/main/java/net/minecraft/src/GuiLogFormatter.java
rename to server/src/main/java/net/minecraft/server/gui/GuiLogFormatter.java
index fabb8d0..d9546b7 100644
--- a/server/src/main/java/net/minecraft/src/GuiLogFormatter.java
+++ b/server/src/main/java/net/minecraft/server/gui/GuiLogFormatter.java
@@ -1,4 +1,4 @@
-package net.minecraft.src;
+package net.minecraft.server.gui;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/server/src/main/java/net/minecraft/src/GuiLogOutputHandler.java b/server/src/main/java/net/minecraft/server/gui/GuiLogOutputHandler.java
similarity index 94%
rename from server/src/main/java/net/minecraft/src/GuiLogOutputHandler.java
rename to server/src/main/java/net/minecraft/server/gui/GuiLogOutputHandler.java
index 5d1f7e9..f6c974f 100644
--- a/server/src/main/java/net/minecraft/src/GuiLogOutputHandler.java
+++ b/server/src/main/java/net/minecraft/server/gui/GuiLogOutputHandler.java
@@ -1,8 +1,7 @@
-package net.minecraft.src;
+package net.minecraft.server.gui;
 
 import java.util.logging.*;
 import javax.swing.JTextArea;
-import javax.swing.text.Document;
 
 public class GuiLogOutputHandler extends Handler
 {
diff --git a/server/src/main/java/net/minecraft/src/GuiStatsComponent.java b/server/src/main/java/net/minecraft/server/gui/GuiStatsComponent.java
similarity index 99%
rename from server/src/main/java/net/minecraft/src/GuiStatsComponent.java
rename to server/src/main/java/net/minecraft/server/gui/GuiStatsComponent.java
index 3d1665f..e84af82 100644
--- a/server/src/main/java/net/minecraft/src/GuiStatsComponent.java
+++ b/server/src/main/java/net/minecraft/server/gui/GuiStatsComponent.java
@@ -1,4 +1,4 @@
-package net.minecraft.src;
+package net.minecraft.server.gui;
 
 import java.awt.*;
 import java.text.DecimalFormat;
diff --git a/server/src/main/java/net/minecraft/src/GuiStatsListener.java b/server/src/main/java/net/minecraft/server/gui/GuiStatsListener.java
similarity index 92%
rename from server/src/main/java/net/minecraft/src/GuiStatsListener.java
rename to server/src/main/java/net/minecraft/server/gui/GuiStatsListener.java
index dee95c9..869d4d9 100644
--- a/server/src/main/java/net/minecraft/src/GuiStatsListener.java
+++ b/server/src/main/java/net/minecraft/server/gui/GuiStatsListener.java
@@ -1,4 +1,4 @@
-package net.minecraft.src;
+package net.minecraft.server.gui;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
diff --git a/server/src/main/java/net/minecraft/src/ServerGUI.java b/server/src/main/java/net/minecraft/server/gui/ServerGUI.java
similarity index 98%
rename from server/src/main/java/net/minecraft/src/ServerGUI.java
rename to server/src/main/java/net/minecraft/server/gui/ServerGUI.java
index cf6e43d..0ed5a62 100644
--- a/server/src/main/java/net/minecraft/src/ServerGUI.java
+++ b/server/src/main/java/net/minecraft/server/gui/ServerGUI.java
@@ -1,4 +1,4 @@
-package net.minecraft.src;
+package net.minecraft.server.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -7,6 +7,7 @@ import javax.swing.*;
 import javax.swing.border.EtchedBorder;
 import javax.swing.border.TitledBorder;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.src.*;
 
 public class ServerGUI extends JComponent implements ICommandListener
 {
diff --git a/server/src/main/java/net/minecraft/src/ServerGuiCommandListener.java b/server/src/main/java/net/minecraft/server/gui/ServerGuiCommandListener.java
similarity index 91%
rename from server/src/main/java/net/minecraft/src/ServerGuiCommandListener.java
rename to server/src/main/java/net/minecraft/server/gui/ServerGuiCommandListener.java
index 01599c7..8540747 100644
--- a/server/src/main/java/net/minecraft/src/ServerGuiCommandListener.java
+++ b/server/src/main/java/net/minecraft/server/gui/ServerGuiCommandListener.java
@@ -1,9 +1,8 @@
-package net.minecraft.src;
+package net.minecraft.server.gui;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JTextField;
-import net.minecraft.server.MinecraftServer;
 
 class ServerGuiCommandListener implements ActionListener
 {
diff --git a/server/src/main/java/net/minecraft/src/ServerGuiFocusAdapter.java b/server/src/main/java/net/minecraft/server/gui/ServerGuiFocusAdapter.java
similarity index 91%
rename from server/src/main/java/net/minecraft/src/ServerGuiFocusAdapter.java
rename to server/src/main/java/net/minecraft/server/gui/ServerGuiFocusAdapter.java
index eb7c904..58a9b55 100644
--- a/server/src/main/java/net/minecraft/src/ServerGuiFocusAdapter.java
+++ b/server/src/main/java/net/minecraft/server/gui/ServerGuiFocusAdapter.java
@@ -1,4 +1,4 @@
-package net.minecraft.src;
+package net.minecraft.server.gui;
 
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
diff --git a/server/src/main/java/net/minecraft/src/ServerWindowAdapter.java b/server/src/main/java/net/minecraft/server/gui/ServerWindowAdapter.java
similarity index 95%
rename from server/src/main/java/net/minecraft/src/ServerWindowAdapter.java
rename to server/src/main/java/net/minecraft/server/gui/ServerWindowAdapter.java
index 1554d57..8a754d4 100644
--- a/server/src/main/java/net/minecraft/src/ServerWindowAdapter.java
+++ b/server/src/main/java/net/minecraft/server/gui/ServerWindowAdapter.java
@@ -1,4 +1,4 @@
-package net.minecraft.src;
+package net.minecraft.server.gui;
 
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
diff --git a/server/src/main/java/net/minecraft/src/RConConsoleSource.java b/server/src/main/java/net/minecraft/server/rcon/RConConsoleSource.java
similarity index 91%
rename from server/src/main/java/net/minecraft/src/RConConsoleSource.java
rename to server/src/main/java/net/minecraft/server/rcon/RConConsoleSource.java
index 846de22..ee506c5 100644
--- a/server/src/main/java/net/minecraft/src/RConConsoleSource.java
+++ b/server/src/main/java/net/minecraft/server/rcon/RConConsoleSource.java
@@ -1,4 +1,6 @@
-package net.minecraft.src;
+package net.minecraft.server.rcon;
+
+import net.minecraft.src.ICommandListener;
 
 public class RConConsoleSource implements ICommandListener
 {
diff --git a/server/src/main/java/net/minecraft/src/RConOutputStream.java b/server/src/main/java/net/minecraft/server/rcon/RConOutputStream.java
similarity index 97%
rename from server/src/main/java/net/minecraft/src/RConOutputStream.java
rename to server/src/main/java/net/minecraft/server/rcon/RConOutputStream.java
index 46a66cc..3b92a70 100644
--- a/server/src/main/java/net/minecraft/src/RConOutputStream.java
+++ b/server/src/main/java/net/minecraft/server/rcon/RConOutputStream.java
@@ -1,4 +1,4 @@
-package net.minecraft.src;
+package net.minecraft.server.rcon;
 
 import java.io.*;
 
diff --git a/server/src/main/java/net/minecraft/src/RConThreadBase.java b/server/src/main/java/net/minecraft/server/rcon/RConThreadBase.java
similarity index 98%
rename from server/src/main/java/net/minecraft/src/RConThreadBase.java
rename to server/src/main/java/net/minecraft/server/rcon/RConThreadBase.java
index dc85373..0412dbe 100644
--- a/server/src/main/java/net/minecraft/src/RConThreadBase.java
+++ b/server/src/main/java/net/minecraft/server/rcon/RConThreadBase.java
@@ -1,4 +1,6 @@
-package net.minecraft.src;
+package net.minecraft.server.rcon;
+
+import net.minecraft.src.IServer;
 
 import java.io.IOException;
 import java.net.DatagramSocket;
diff --git a/server/src/main/java/net/minecraft/src/RConThreadClient.java b/server/src/main/java/net/minecraft/server/rcon/RConThreadClient.java
similarity index 98%
rename from server/src/main/java/net/minecraft/src/RConThreadClient.java
rename to server/src/main/java/net/minecraft/server/rcon/RConThreadClient.java
index 1722752..cf04138 100644
--- a/server/src/main/java/net/minecraft/src/RConThreadClient.java
+++ b/server/src/main/java/net/minecraft/server/rcon/RConThreadClient.java
@@ -1,4 +1,6 @@
-package net.minecraft.src;
+package net.minecraft.server.rcon;
+
+import net.minecraft.src.IServer;
 
 import java.io.*;
 import java.net.Socket;
diff --git a/server/src/main/java/net/minecraft/src/RConThreadMain.java b/server/src/main/java/net/minecraft/server/rcon/RConThreadMain.java
similarity index 98%
rename from server/src/main/java/net/minecraft/src/RConThreadMain.java
rename to server/src/main/java/net/minecraft/server/rcon/RConThreadMain.java
index ef6e49e..adf6123 100644
--- a/server/src/main/java/net/minecraft/src/RConThreadMain.java
+++ b/server/src/main/java/net/minecraft/server/rcon/RConThreadMain.java
@@ -1,4 +1,6 @@
-package net.minecraft.src;
+package net.minecraft.server.rcon;
+
+import net.minecraft.src.IServer;
 
 import java.io.IOException;
 import java.net.*;
diff --git a/server/src/main/java/net/minecraft/src/RConThreadQuery.java b/server/src/main/java/net/minecraft/server/rcon/RConThreadQuery.java
similarity index 99%
rename from server/src/main/java/net/minecraft/src/RConThreadQuery.java
rename to server/src/main/java/net/minecraft/server/rcon/RConThreadQuery.java
index 72380d1..81a5916 100644
--- a/server/src/main/java/net/minecraft/src/RConThreadQuery.java
+++ b/server/src/main/java/net/minecraft/server/rcon/RConThreadQuery.java
@@ -1,4 +1,6 @@
-package net.minecraft.src;
+package net.minecraft.server.rcon;
+
+import net.minecraft.src.IServer;
 
 import java.io.IOException;
 import java.net.*;
diff --git a/server/src/main/java/net/minecraft/src/RConThreadQueryAuth.java b/server/src/main/java/net/minecraft/server/rcon/RConThreadQueryAuth.java
similarity index 98%
rename from server/src/main/java/net/minecraft/src/RConThreadQueryAuth.java
rename to server/src/main/java/net/minecraft/server/rcon/RConThreadQueryAuth.java
index b117bd3..df84ccf 100644
--- a/server/src/main/java/net/minecraft/src/RConThreadQueryAuth.java
+++ b/server/src/main/java/net/minecraft/server/rcon/RConThreadQueryAuth.java
@@ -1,4 +1,4 @@
-package net.minecraft.src;
+package net.minecraft.server.rcon;
 
 import java.net.DatagramPacket;
 import java.util.Date;
diff --git a/server/src/main/java/net/minecraft/src/RConUtils.java b/server/src/main/java/net/minecraft/server/rcon/RConUtils.java
similarity index 98%
rename from server/src/main/java/net/minecraft/src/RConUtils.java
rename to server/src/main/java/net/minecraft/server/rcon/RConUtils.java
index 5274846..a983fe6 100644
--- a/server/src/main/java/net/minecraft/src/RConUtils.java
+++ b/server/src/main/java/net/minecraft/server/rcon/RConUtils.java
@@ -1,4 +1,4 @@
-package net.minecraft.src;
+package net.minecraft.server.rcon;
 
 public class RConUtils
 {