Rename parser, again. Issue 1903

build-reports.xml

@@ -60,7 +60,7 @@
                          classpath="checkstyle.jar"/>
         <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
                                 failOnViolation="false">
-            <fileset dir="src/com/dmdirc/parser/" includes="**/*.java"/>
+            <fileset dir="src/com.dmdirc.parser.irc/" includes="**/*.java"/>
             <formatter type="xml" tofile="reports/report-parser.xml"/>
         </checkstyle>
         <xslt in="reports/report-parser.xml" out="reports/report-parser.html" style="checkstyle/checkstyle.xsl"/>

src/com/dmdirc/Channel.java

@@ -28,9 +28,9 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;

src/com/dmdirc/ChannelEventHandler.java

@@ -24,13 +24,13 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.callbacks.CallbackManager;
-import com.dmdirc.parser.callbacks.CallbackNotFoundException;
-import com.dmdirc.parser.callbacks.interfaces.*;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.CallbackManager;
+import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
+import com.dmdirc.parser.irc.callbacks.interfaces.*;
 
 /**
  * Handles events for channel objects.

src/com/dmdirc/EventHandler.java

@@ -24,10 +24,10 @@ package com.dmdirc;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.callbacks.CallbackManager;
-import com.dmdirc.parser.callbacks.CallbackNotFoundException;
-import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.CallbackManager;
+import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
+import com.dmdirc.parser.irc.callbacks.interfaces.ICallbackInterface;
 
 /**
  * Abstracts some behaviour used by Event Handlers.
@@ -37,7 +37,7 @@ import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
 public abstract class EventHandler implements ICallbackInterface {
     
     /** The prefix indicating that the interface is a parser callback. */
-    private static final String CALLBACK_PREFIX = "com.dmdirc.parser.callbacks.interfaces.I";
+    private static final String CALLBACK_PREFIX = "com.dmdirc.parser.irc.callbacks.interfaces.I";
     
     /**
      * Registers all callbacks that this event handler implements with the
@@ -73,7 +73,7 @@ public abstract class EventHandler implements ICallbackInterface {
      * 
      * @param cbm The callback manager to use
      * @param name The name of the callback to be added
-     * @throws com.dmdirc.parser.callbacks.CallbackNotFoundException
+     * @throws com.dmdirc.parser.irc.callbacks.CallbackNotFoundException
      * if the specified callback isn't found
      */
     protected abstract void addCallback(CallbackManager cbm, String name) 

src/com/dmdirc/IgnoreList.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.parser.RegexStringList;
+import com.dmdirc.parser.irc.RegexStringList;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/dmdirc/Invite.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 
 import java.util.Date;
 

src/com/dmdirc/ParserFactory.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.MyInfo;
-import com.dmdirc.parser.ServerInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.MyInfo;
+import com.dmdirc.parser.irc.ServerInfo;
 
 /**
  * Provides a method to retrieve a parser.

src/com/dmdirc/Query.java

@@ -28,14 +28,14 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.callbacks.CallbackManager;
-import com.dmdirc.parser.callbacks.CallbackNotFoundException;
-import com.dmdirc.parser.callbacks.interfaces.INickChanged;
-import com.dmdirc.parser.callbacks.interfaces.IPrivateAction;
-import com.dmdirc.parser.callbacks.interfaces.IPrivateMessage;
-import com.dmdirc.parser.callbacks.interfaces.IQuit;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.CallbackManager;
+import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
+import com.dmdirc.parser.irc.callbacks.interfaces.INickChanged;
+import com.dmdirc.parser.irc.callbacks.interfaces.IPrivateAction;
+import com.dmdirc.parser.irc.callbacks.interfaces.IPrivateMessage;
+import com.dmdirc.parser.irc.callbacks.interfaces.IQuit;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;

src/com/dmdirc/Raw.java

@@ -24,10 +24,10 @@ package com.dmdirc;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.callbacks.CallbackNotFoundException;
-import com.dmdirc.parser.callbacks.interfaces.IDataIn;
-import com.dmdirc.parser.callbacks.interfaces.IDataOut;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
+import com.dmdirc.parser.irc.callbacks.interfaces.IDataIn;
+import com.dmdirc.parser.irc.callbacks.interfaces.IDataOut;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 

src/com/dmdirc/Server.java

@@ -34,13 +34,13 @@ import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.IRCStringConverter;
-import com.dmdirc.parser.MyInfo;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.ServerInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.IRCStringConverter;
+import com.dmdirc.parser.irc.MyInfo;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.ServerInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;

src/com/dmdirc/ServerEventHandler.java

@@ -26,13 +26,13 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.CallbackManager;
-import com.dmdirc.parser.callbacks.CallbackNotFoundException;
-import com.dmdirc.parser.callbacks.interfaces.*;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.CallbackManager;
+import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
+import com.dmdirc.parser.irc.callbacks.interfaces.*;
 
 /**
  * Handles parser events for a Server object.

src/com/dmdirc/actions/CoreActionComponent.java

@@ -29,9 +29,9 @@ import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
 
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.ui.messages.Styliser;
 import java.awt.Color;
 import java.awt.event.KeyEvent;

src/com/dmdirc/actions/metatypes/ChannelEvents.java

@@ -25,7 +25,7 @@ package com.dmdirc.actions.metatypes;
 import com.dmdirc.Channel;
 import com.dmdirc.Topic;
 import com.dmdirc.actions.interfaces.ActionMetaType;
-import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
 
 /**
  * Defines channel-related events.

src/com/dmdirc/actions/metatypes/ServerEvents.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.Server;
 import com.dmdirc.actions.interfaces.ActionMetaType;
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 
 /**
  * Defines server-related events.

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.Main;
 import com.dmdirc.Server;
-import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -37,8 +37,8 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.swing.components.TextFrame;

src/com/dmdirc/addons/dcc/DCCSendWindow.java

@@ -36,8 +36,8 @@ import java.awt.event.ActionListener;
 
 import net.miginfocom.swing.MigLayout;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.callbacks.interfaces.ISocketClosed;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.interfaces.ISocketClosed;
 
 import java.io.File;
 

src/com/dmdirc/addons/dcc/actions/DCCEvents.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.dcc.actions;
 
 import com.dmdirc.Server;
 import com.dmdirc.actions.interfaces.ActionMetaType;
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 
 import com.dmdirc.addons.dcc.DCCChatWindow;
 import com.dmdirc.addons.dcc.DCCSendWindow;

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -39,10 +39,10 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.IRCParser;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -33,9 +33,9 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.messages.ColourManager;
 

src/com/dmdirc/addons/userlevel/AccessLevelComponent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.userlevel;
 
 import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 
 /**
  * Action component to retrieve a client's global access level.

src/com/dmdirc/addons/userlevel/ChannelAccessLevelComponent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.userlevel;
 
 import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
 
 /**
  * Action component to retrieve a channel client's access level.

src/com/dmdirc/addons/userlevel/UserLevelPlugin.java

@@ -29,8 +29,8 @@ import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 
 import java.util.HashMap;

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -37,9 +37,9 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;

src/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -27,7 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.parser.ChannelInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -28,7 +28,7 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.parser.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.ChannelWindow;

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -27,8 +27,8 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ExternalCommand;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**

src/com/dmdirc/parser/ChannelClientInfo.java → src/com/dmdirc/parser/irc/ChannelClientInfo.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 import java.util.HashMap;
 import java.util.Map;

src/com/dmdirc/parser/ChannelInfo.java → src/com/dmdirc/parser/irc/ChannelInfo.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 import java.util.ArrayList;
 import java.util.Hashtable;

src/com/dmdirc/parser/ChannelListModeItem.java → src/com/dmdirc/parser/irc/ChannelListModeItem.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 /**
  * Contains Channel List Mode information.

src/com/dmdirc/parser/ClientInfo.java → src/com/dmdirc/parser/irc/ClientInfo.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/dmdirc/parser/IRCAuthenticator.java → src/com/dmdirc/parser/irc/IRCAuthenticator.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;

src/com/dmdirc/parser/IRCParser.java → src/com/dmdirc/parser/irc/IRCParser.java

@@ -20,20 +20,20 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
-
-import com.dmdirc.parser.callbacks.CallbackManager;
-import com.dmdirc.parser.callbacks.CallbackOnConnectError;
-import com.dmdirc.parser.callbacks.CallbackOnDataIn;
-import com.dmdirc.parser.callbacks.CallbackOnDataOut;
-import com.dmdirc.parser.callbacks.CallbackOnDebugInfo;
-import com.dmdirc.parser.callbacks.CallbackOnErrorInfo;
-import com.dmdirc.parser.callbacks.CallbackOnServerError;
-import com.dmdirc.parser.callbacks.CallbackOnSocketClosed;
-import com.dmdirc.parser.callbacks.CallbackOnPingFailed;
-import com.dmdirc.parser.callbacks.CallbackOnPingSent;
-import com.dmdirc.parser.callbacks.CallbackOnPingSuccess;
-import com.dmdirc.parser.callbacks.CallbackOnPost005;
+package com.dmdirc.parser.irc;
+
+import com.dmdirc.parser.irc.callbacks.CallbackManager;
+import com.dmdirc.parser.irc.callbacks.CallbackOnConnectError;
+import com.dmdirc.parser.irc.callbacks.CallbackOnDataIn;
+import com.dmdirc.parser.irc.callbacks.CallbackOnDataOut;
+import com.dmdirc.parser.irc.callbacks.CallbackOnDebugInfo;
+import com.dmdirc.parser.irc.callbacks.CallbackOnErrorInfo;
+import com.dmdirc.parser.irc.callbacks.CallbackOnServerError;
+import com.dmdirc.parser.irc.callbacks.CallbackOnSocketClosed;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPingFailed;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPingSent;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPingSuccess;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPost005;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -435,7 +435,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the ServerError Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IServerError
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IServerError
 	 * @param message The error message
 	 * @return true if a method was called, false otherwise
 	 */
@@ -446,7 +446,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the DataIn Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IDataIn
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IDataIn
 	 * @param data Incomming Line.
 	 * @return true if a method was called, false otherwise
 	 */
@@ -460,7 +460,7 @@ public class IRCParser implements Runnable {
 	 * @param data Outgoing Data
 	 * @param fromParser True if parser sent the data, false if sent using .sendLine
 	 * @return true if a method was called, false otherwise
-	 * @see com.dmdirc.parser.callbacks.interfaces.IDataOut
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IDataOut
 	 */
 	protected boolean callDataOut(final String data, final boolean fromParser) {
 		return ((CallbackOnDataOut) myCallbackManager.getCallbackType("OnDataOut")).call(data, fromParser);
@@ -469,7 +469,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the DebugInfo Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IDebugInfo
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IDebugInfo
 	 * @param level Debugging Level (DEBUG_INFO, DEBUG_SOCKET etc)
 	 * @param data Debugging Information as a format string
 	 * @param args Formatting String Options
@@ -481,7 +481,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the DebugInfo Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IDebugInfo
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IDebugInfo
 	 * @param level Debugging Level (DEBUG_INFO, DEBUG_SOCKET etc)
 	 * @param data Debugging Information
 	 * @return true if a method was called, false otherwise
@@ -493,7 +493,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the IErrorInfo Interface.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IErrorInfo
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IErrorInfo
 	 * @param errorInfo ParserError object representing the error.
 	 * @return true if a method was called, false otherwise
 	 */
@@ -504,7 +504,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the IConnectError Interface.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IConnectError
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IConnectError
 	 * @param errorInfo ParserError object representing the error.
 	 * @return true if a method was called, false otherwise
 	 */
@@ -515,7 +515,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the SocketClosed Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.ISocketClosed
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.ISocketClosed
 	 * @return true if a method was called, false otherwise
 	 */
 	protected boolean callSocketClosed() {
@@ -525,7 +525,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the PingFailed Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IPingFailed
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPingFailed
 	 * @return true if a method was called, false otherwise
 	 */
 	protected boolean callPingFailed() {
@@ -535,7 +535,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the PingSent Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IPingSent
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPingSent
 	 * @return true if a method was called, false otherwise
 	 */
 	protected boolean callPingSent() {
@@ -545,7 +545,7 @@ public class IRCParser implements Runnable {
 	/**
 	 * Callback to all objects implementing the PingSuccess Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IPingSuccess
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPingSuccess
 	 * @return true if a method was called, false otherwise
 	 */
 	protected boolean callPingSuccess() {

src/com/dmdirc/parser/IRCProcessor.java → src/com/dmdirc/parser/irc/IRCProcessor.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackManager;
+import com.dmdirc.parser.irc.callbacks.CallbackManager;
 
 /**
  * IRCProcessor.
@@ -53,7 +53,7 @@ public abstract class IRCProcessor {
 	/**
 	 * Callback to all objects implementing the IErrorInfo Interface.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IErrorInfo
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IErrorInfo
 	 * @param errorInfo ParserError object representing the error.
 	 * @return true if a method was called, false otherwise
 	 */
@@ -64,7 +64,7 @@ public abstract class IRCProcessor {
 	/**
 	 * Callback to all objects implementing the DebugInfo Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IDebugInfo
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IDebugInfo
 	 * @param level Debugging Level (DEBUG_INFO, ndSocket etc)
 	 * @param data Debugging Information
 	 * @param args Formatting String Options
@@ -77,7 +77,7 @@ public abstract class IRCProcessor {
 	/**
 	 * Callback to all objects implementing the DebugInfo Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IDebugInfo
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IDebugInfo
 	 * @param level Debugging Level (DEBUG_INFO, ndSocket etc)
 	 * @param data Debugging Information
 	 * @return true if a method was called, false otherwise

src/com/dmdirc/parser/IRCStringConverter.java → src/com/dmdirc/parser/irc/IRCStringConverter.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 /**
  * IRC String Converter.

src/com/dmdirc/parser/Logging.java → src/com/dmdirc/parser/irc/Logging.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;

src/com/dmdirc/parser/MyInfo.java → src/com/dmdirc/parser/irc/MyInfo.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 /**
  * Contains User information.

src/com/dmdirc/parser/ParserError.java → src/com/dmdirc/parser/irc/ParserError.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 /**
  * IRC Parser Error.

src/com/dmdirc/parser/PingTimer.java → src/com/dmdirc/parser/irc/PingTimer.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 import java.util.TimerTask;
 import java.util.Timer;

src/com/dmdirc/parser/Process001.java → src/com/dmdirc/parser/irc/Process001.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnServerReady;
+import com.dmdirc.parser.irc.callbacks.CallbackOnServerReady;
 
 /**
  * Process a 001 message.

src/com/dmdirc/parser/Process004005.java → src/com/dmdirc/parser/irc/Process004005.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnGotNetwork;
+import com.dmdirc.parser.irc.callbacks.CallbackOnGotNetwork;
 
 /**
  * Process ISUPPORT lines.

src/com/dmdirc/parser/Process464.java → src/com/dmdirc/parser/irc/Process464.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnPasswordRequired;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPasswordRequired;
 
 /**
  * Process a 464 message.

src/com/dmdirc/parser/ProcessAway.java → src/com/dmdirc/parser/irc/ProcessAway.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnAwayState;
+import com.dmdirc.parser.irc.callbacks.CallbackOnAwayState;
 
 /**
  * Process an Away/Back message.

src/com/dmdirc/parser/ProcessInvite.java → src/com/dmdirc/parser/irc/ProcessInvite.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnInvite;
+import com.dmdirc.parser.irc.callbacks.CallbackOnInvite;
 
 /**
  * Process an Invite Request.

src/com/dmdirc/parser/ProcessJoin.java → src/com/dmdirc/parser/irc/ProcessJoin.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnChannelJoin;
-import com.dmdirc.parser.callbacks.CallbackOnChannelSelfJoin;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelJoin;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelSelfJoin;
 
 /**
  * Process a channel join.

src/com/dmdirc/parser/ProcessKick.java → src/com/dmdirc/parser/irc/ProcessKick.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnChannelKick;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelKick;
 
 /**
  * Process a channel kick.

src/com/dmdirc/parser/ProcessListModes.java → src/com/dmdirc/parser/irc/ProcessListModes.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 import java.util.LinkedList;
 import java.util.Queue;
 
-import com.dmdirc.parser.callbacks.CallbackOnChannelGotListModes;
-// import com.dmdirc.parser.callbacks.interfaces.;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelGotListModes;
+// import com.dmdirc.parser.irc.callbacks.interfaces.;
 
 /**
  * Process a List Modes.

src/com/dmdirc/parser/ProcessMOTD.java → src/com/dmdirc/parser/irc/ProcessMOTD.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnMOTDEnd;
-import com.dmdirc.parser.callbacks.CallbackOnMOTDLine;
-import com.dmdirc.parser.callbacks.CallbackOnMOTDStart;
+import com.dmdirc.parser.irc.callbacks.CallbackOnMOTDEnd;
+import com.dmdirc.parser.irc.callbacks.CallbackOnMOTDLine;
+import com.dmdirc.parser.irc.callbacks.CallbackOnMOTDStart;
 
 /**
  * Process a MOTD Related Line.

src/com/dmdirc/parser/ProcessMessage.java → src/com/dmdirc/parser/irc/ProcessMessage.java

@@ -20,23 +20,23 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnChannelAction;
-import com.dmdirc.parser.callbacks.CallbackOnChannelCTCP;
-import com.dmdirc.parser.callbacks.CallbackOnChannelCTCPReply;
-import com.dmdirc.parser.callbacks.CallbackOnChannelMessage;
-import com.dmdirc.parser.callbacks.CallbackOnChannelNotice;
-import com.dmdirc.parser.callbacks.CallbackOnPrivateAction;
-import com.dmdirc.parser.callbacks.CallbackOnPrivateCTCP;
-import com.dmdirc.parser.callbacks.CallbackOnPrivateCTCPReply;
-import com.dmdirc.parser.callbacks.CallbackOnPrivateMessage;
-import com.dmdirc.parser.callbacks.CallbackOnPrivateNotice;
-import com.dmdirc.parser.callbacks.CallbackOnUnknownAction;
-import com.dmdirc.parser.callbacks.CallbackOnUnknownCTCP;
-import com.dmdirc.parser.callbacks.CallbackOnUnknownCTCPReply;
-import com.dmdirc.parser.callbacks.CallbackOnUnknownMessage;
-import com.dmdirc.parser.callbacks.CallbackOnUnknownNotice;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelAction;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelCTCP;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelCTCPReply;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelMessage;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelNotice;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPrivateAction;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPrivateCTCP;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPrivateCTCPReply;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPrivateMessage;
+import com.dmdirc.parser.irc.callbacks.CallbackOnPrivateNotice;
+import com.dmdirc.parser.irc.callbacks.CallbackOnUnknownAction;
+import com.dmdirc.parser.irc.callbacks.CallbackOnUnknownCTCP;
+import com.dmdirc.parser.irc.callbacks.CallbackOnUnknownCTCPReply;
+import com.dmdirc.parser.irc.callbacks.CallbackOnUnknownMessage;
+import com.dmdirc.parser.irc.callbacks.CallbackOnUnknownNotice;
 
 
 /**
@@ -208,7 +208,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the ChannelAction Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IChannelAction
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelAction
 	 * @param cChannel Channel where the action was sent to
 	 * @param cChannelClient ChannelClient who sent the action (may be null if server)
 	 * @param sMessage action contents
@@ -222,7 +222,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the ChannelCTCP Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IChannelCTCP
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelCTCP
 	 * @param cChannel Channel where CTCP was sent
 	 * @param cChannelClient ChannelClient who sent the message (may be null if server)
 	 * @param sType Type of CTCP (VERSION, TIME etc)
@@ -237,7 +237,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the ChannelCTCPReply Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IChannelCTCPReply
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelCTCPReply
 	 * @param cChannel Channel where CTCPReply was sent
 	 * @param cChannelClient ChannelClient who sent the message (may be null if server)
 	 * @param sType Type of CTCPRReply (VERSION, TIME etc)
@@ -252,7 +252,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the ChannelMessage Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IChannelMessage
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelMessage
 	 * @param cChannel Channel where the message was sent to
 	 * @param cChannelClient ChannelClient who sent the message (may be null if server)
 	 * @param sMessage Message contents
@@ -266,7 +266,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the ChannelNotice Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IChannelNotice
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelNotice
 	 * @param cChannel Channel where the notice was sent to
 	 * @param cChannelClient ChannelClient who sent the notice (may be null if server)
 	 * @param sMessage notice contents
@@ -280,7 +280,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the PrivateAction Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IPrivateAction
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateAction
 	 * @param sMessage action contents
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
@@ -292,7 +292,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the PrivateCTCP Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IPrivateCTCP
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateCTCP
 	 * @param sType Type of CTCP (VERSION, TIME etc)
 	 * @param sMessage Additional contents
 	 * @param sHost Hostname of sender (or servername)
@@ -305,7 +305,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the PrivateCTCPReply Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IPrivateCTCPReply
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateCTCPReply
 	 * @param sType Type of CTCPRReply (VERSION, TIME etc)
 	 * @param sMessage Reply Contents
 	 * @param sHost Hostname of sender (or servername)
@@ -318,7 +318,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the PrivateMessage Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IPrivateMessage
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateMessage
 	 * @param sMessage Message contents
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
@@ -330,7 +330,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the PrivateNotice Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IPrivateNotice
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateNotice
 	 * @param sMessage Notice contents
 	 * @param sHost Hostname of sender (or servername)
 	 * @return true if a method was called, false otherwise
@@ -342,7 +342,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the UnknownAction Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IUnknownAction
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownAction
 	 * @param sMessage Action contents
 	 * @param sTarget Actual target of action
 	 * @param sHost Hostname of sender (or servername)
@@ -355,7 +355,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the UnknownCTCP Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IUnknownCTCP
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownCTCP
 	 * @param sType Type of CTCP (VERSION, TIME etc)
 	 * @param sMessage Additional contents
 	 * @param sTarget Actual Target of CTCP
@@ -369,7 +369,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the UnknownCTCPReply Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IUnknownCTCPReply
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownCTCPReply
 	 * @param sType Type of CTCPRReply (VERSION, TIME etc)
 	 * @param sMessage Reply Contents
 	 * @param sTarget Actual Target of CTCPReply
@@ -383,7 +383,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the UnknownMessage Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IUnknownMessage
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownMessage
 	 * @param sMessage Message contents
 	 * @param sTarget Actual target of message
 	 * @param sHost Hostname of sender (or servername)
@@ -396,7 +396,7 @@ public class ProcessMessage extends IRCProcessor {
 	/**
 	 * Callback to all objects implementing the UnknownNotice Callback.
 	 *
-	 * @see com.dmdirc.parser.callbacks.interfaces.IUnknownNotice
+	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownNotice
 	 * @param sMessage Notice contents
 	 * @param sTarget Actual target of notice
 	 * @param sHost Hostname of sender (or servername)

src/com/dmdirc/parser/ProcessMode.java → src/com/dmdirc/parser/irc/ProcessMode.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnChannelSingleModeChanged;
-import com.dmdirc.parser.callbacks.CallbackOnChannelNonUserModeChanged;
-import com.dmdirc.parser.callbacks.CallbackOnChannelModeChanged;
-import com.dmdirc.parser.callbacks.CallbackOnChannelUserModeChanged;
-import com.dmdirc.parser.callbacks.CallbackOnUserModeChanged;
-import com.dmdirc.parser.callbacks.CallbackOnUserModeDiscovered;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelSingleModeChanged;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelNonUserModeChanged;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelModeChanged;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelUserModeChanged;
+import com.dmdirc.parser.irc.callbacks.CallbackOnUserModeChanged;
+import com.dmdirc.parser.irc.callbacks.CallbackOnUserModeDiscovered;
 
 import java.util.Calendar;
 

src/com/dmdirc/parser/ProcessNames.java → src/com/dmdirc/parser/irc/ProcessNames.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnChannelGotNames;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelGotNames;
 
 /**
  * Process a Names reply.

src/com/dmdirc/parser/ProcessNick.java → src/com/dmdirc/parser/irc/ProcessNick.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnChannelNickChanged;
-import com.dmdirc.parser.callbacks.CallbackOnNickChanged;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelNickChanged;
+import com.dmdirc.parser.irc.callbacks.CallbackOnNickChanged;
 
 /**
  * Process a Nick change.

src/com/dmdirc/parser/ProcessNickInUse.java → src/com/dmdirc/parser/irc/ProcessNickInUse.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnNickInUse;
+import com.dmdirc.parser.irc.callbacks.CallbackOnNickInUse;
 
 /**
  * Process a NickInUse message.

src/com/dmdirc/parser/ProcessNoticeAuth.java → src/com/dmdirc/parser/irc/ProcessNoticeAuth.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnNoticeAuth;
+import com.dmdirc.parser.irc.callbacks.CallbackOnNoticeAuth;
 
 /**
  * Process a NoticeAuth message.

src/com/dmdirc/parser/ProcessPart.java → src/com/dmdirc/parser/irc/ProcessPart.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnChannelPart;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelPart;
 
 /**
  * Process a channel part.

src/com/dmdirc/parser/ProcessQuit.java → src/com/dmdirc/parser/irc/ProcessQuit.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 import java.util.ArrayList;
-import com.dmdirc.parser.callbacks.CallbackOnChannelQuit;
-import com.dmdirc.parser.callbacks.CallbackOnQuit;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelQuit;
+import com.dmdirc.parser.irc.callbacks.CallbackOnQuit;
 
 /**
  * Process a Quit message.

src/com/dmdirc/parser/ProcessTopic.java → src/com/dmdirc/parser/irc/ProcessTopic.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnChannelTopic;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelTopic;
 
 /**
  * Process a topic change.

src/com/dmdirc/parser/ProcessWallops.java → src/com/dmdirc/parser/irc/ProcessWallops.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnWallDesync;
-import com.dmdirc.parser.callbacks.CallbackOnWallop;
-import com.dmdirc.parser.callbacks.CallbackOnWalluser;
+import com.dmdirc.parser.irc.callbacks.CallbackOnWallDesync;
+import com.dmdirc.parser.irc.callbacks.CallbackOnWallop;
+import com.dmdirc.parser.irc.callbacks.CallbackOnWalluser;
 
 /**
  * Process a WALLOPS Message.

src/com/dmdirc/parser/ProcessWho.java → src/com/dmdirc/parser/irc/ProcessWho.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnAwayState;
-import com.dmdirc.parser.callbacks.CallbackOnAwayStateOther;
-import com.dmdirc.parser.callbacks.CallbackOnChannelAwayStateOther;
+import com.dmdirc.parser.irc.callbacks.CallbackOnAwayState;
+import com.dmdirc.parser.irc.callbacks.CallbackOnAwayStateOther;
+import com.dmdirc.parser.irc.callbacks.CallbackOnChannelAwayStateOther;
 
 /**
  * Process a /who reply.

src/com/dmdirc/parser/ProcessingManager.java → src/com/dmdirc/parser/irc/ProcessingManager.java

@@ -20,9 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
-import com.dmdirc.parser.callbacks.CallbackOnNumeric;
+import com.dmdirc.parser.irc.callbacks.CallbackOnNumeric;
 
 import java.util.Hashtable;
 

src/com/dmdirc/parser/ProcessorNotFoundException.java → src/com/dmdirc/parser/irc/ProcessorNotFoundException.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 /**
  * IRC Parser Processor Not Found Exception.

src/com/dmdirc/parser/RegexStringList.java → src/com/dmdirc/parser/irc/RegexStringList.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/dmdirc/parser/ServerInfo.java → src/com/dmdirc/parser/irc/ServerInfo.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser;
+package com.dmdirc.parser.irc;
 
 /**
  * Contains Server information.

src/com/dmdirc/parser/callbacks/CallbackManager.java → src/com/dmdirc/parser/irc/callbacks/CallbackManager.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
 import java.util.Hashtable;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.interfaces.ICallbackInterface;
 
 /**
  * IRC Parser Callback Manager.

src/com/dmdirc/parser/callbacks/CallbackNotFoundException.java → src/com/dmdirc/parser/irc/callbacks/CallbackNotFoundException.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
 /**
  * IRC Parser Callback Exception.

src/com/dmdirc/parser/callbacks/CallbackObject.java → src/com/dmdirc/parser/irc/callbacks/CallbackObject.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
 import java.util.ArrayList;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.ICallbackInterface;
 
 /**
  * CallbackObject.

src/com/dmdirc/parser/callbacks/CallbackObjectSpecific.java → src/com/dmdirc/parser/irc/callbacks/CallbackObjectSpecific.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
 import java.util.Hashtable;
 
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.callbacks.interfaces.ICallbackInterface;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.callbacks.interfaces.ICallbackInterface;
 
 /**
  * CallbackObjectSpecific.

src/com/dmdirc/parser/callbacks/CallbackOnAwayState.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnAwayState.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IAwayState;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IAwayState;
 
 /**
  * Callback to all objects implementing the IAwayState Interface.

src/com/dmdirc/parser/callbacks/CallbackOnAwayStateOther.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnAwayStateOther.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IAwayStateOther;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IAwayStateOther;
 
 /**
  * Callback to all objects implementing the IAwayStateOther Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelAction.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelAction.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelAction;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelAction;
 
 /**
  * Callback to all objects implementing the IChannelAction Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelAwayStateOther.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelAwayStateOther.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelAwayStateOther;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelAwayStateOther;
 
 /**
  * Callback to all objects implementing the IChannelAwayStateOther Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelCTCP.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelCTCP.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelCTCP;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelCTCP;
 
 /**
  * Callback to all objects implementing the IChannelCTCP Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelCTCPReply.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelCTCPReply.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelCTCPReply;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelCTCPReply;
 
 /**
  * Callback to all objects implementing the IChannelCTCPReply Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelGotListModes.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelGotListModes.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelGotListModes;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelGotListModes;
 
 /**
  * Callback to all objects implementing the IChannelGotListModes Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelGotNames.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelGotNames.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelGotNames;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelGotNames;
 
 /**
  * Callback to all objects implementing the IChannelGotNames Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelJoin.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelJoin.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelJoin;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelJoin;
 
 /**
  * Callback to all objects implementing the IChannelJoin Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelKick.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelKick.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelKick;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelKick;
 
 /**
  * Callback to all objects implementing the IChannelKick Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelMessage.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelMessage.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelMessage;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelMessage;
 
 /**
  * Callback to all objects implementing the IChannelMessage Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelModeChanged.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelModeChanged.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelModeChanged;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelModeChanged;
 
 /**
  * Callback to all objects implementing the IChannelModeChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelNickChanged.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelNickChanged.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelNickChanged;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelNickChanged;
 
 /**
  * Callback to all objects implementing the IChannelNickChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelNonUserModeChanged.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelNonUserModeChanged.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelNonUserModeChanged;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelNonUserModeChanged;
 
 /**
  * Callback to all objects implementing the IChannelNonUserModeChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelNotice.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelNotice.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelNotice;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelNotice;
 
 /**
  * Callback to all objects implementing the IChannelNotice Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelPart.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelPart.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelPart;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelPart;
 
 /**
  * Callback to all objects implementing the IChannelPart Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelQuit.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelQuit.java

@@ -20,13 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelQuit;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelQuit;
 
 /**
  * Callback to all objects implementing the IChannelQuit Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelSelfJoin.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelSelfJoin.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelSelfJoin;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelSelfJoin;
 
 /**
  * Callback to all objects implementing the IChannelSelfJoin Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelSingleModeChanged.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelSingleModeChanged.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelSingleModeChanged;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelSingleModeChanged;
 
 /**
  * Callback to all objects implementing the IChannelSingleModeChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelTopic.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelTopic.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelTopic;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelTopic;
 
 /**
  * Callback to all objects implementing the IChannelTopic Interface.

src/com/dmdirc/parser/callbacks/CallbackOnChannelUserModeChanged.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnChannelUserModeChanged.java

@@ -20,14 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IChannelUserModeChanged;
+import com.dmdirc.parser.irc.ClientInfo;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.parser.irc.ChannelInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IChannelUserModeChanged;
 
 /**
  * Callback to all objects implementing the IChannelUserModeChanged Interface.

src/com/dmdirc/parser/callbacks/CallbackOnConnectError.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnConnectError.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IConnectError;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IConnectError;
 
 /**
  * Callback to all objects implementing the IConnectError Interface.

src/com/dmdirc/parser/callbacks/CallbackOnDataIn.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnDataIn.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IDataIn;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IDataIn;
 
 /**
  * Callback to all objects implementing the IDataIn Interface.

src/com/dmdirc/parser/callbacks/CallbackOnDataOut.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnDataOut.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IDataOut;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IDataOut;
 
 /**
  * Callback to all objects implementing the IDataOut Interface.

src/com/dmdirc/parser/callbacks/CallbackOnDebugInfo.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnDebugInfo.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IDebugInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IDebugInfo;
 
 /**
  * Callback to all objects implementing the IDebugInfo Interface.

src/com/dmdirc/parser/callbacks/CallbackOnErrorInfo.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnErrorInfo.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IErrorInfo;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IErrorInfo;
 
 /**
  * Callback to all objects implementing the IErrorInfo Interface.

src/com/dmdirc/parser/callbacks/CallbackOnGotNetwork.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnGotNetwork.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IGotNetwork;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IGotNetwork;
 
 /**
  * Callback to all objects implementing the IGotNetwork Interface.

src/com/dmdirc/parser/callbacks/CallbackOnInvite.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnInvite.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IInvite;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IInvite;
 
 /**
  * Callback to all objects implementing the IInvite Interface.

src/com/dmdirc/parser/callbacks/CallbackOnMOTDEnd.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnMOTDEnd.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IMOTDEnd;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IMOTDEnd;
 
 /**
  * Callback to all objects implementing the IMotdEnd Interface.

src/com/dmdirc/parser/callbacks/CallbackOnMOTDLine.java → src/com/dmdirc/parser/irc/callbacks/CallbackOnMOTDLine.java

@@ -20,11 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.callbacks;
+package com.dmdirc.parser.irc.callbacks;
 
-import com.dmdirc.parser.IRCParser;
-import com.dmdirc.parser.ParserError;
-import com.dmdirc.parser.callbacks.interfaces.IMOTDLine;
+import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.irc.ParserError;
+import com.dmdirc.parser.irc.callbacks.interfaces.IMOTDLine;
 
 /**
  * Callback to all objects implementing the IMOTDLine Interface.