Move interfaces to a central location.

Depends-On: If624693f050e1aa9cf4cabcd5264518604eb8bcd
Change-Id: I862891efc407a64559788812ee039a9ec565a973
Reviewed-on: http://gerrit.dmdirc.com/2166
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/addons/contactlist/ContactListListener.java

 import com.dmdirc.Query;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.NicklistListener;

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

 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCChat;

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

 
 package com.dmdirc.addons.dcc.actions;
 
-import com.dmdirc.actions.interfaces.ActionMetaType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 /**
  * DCC actions.

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

 package com.dmdirc.addons.dcc.actions;
 
 import com.dmdirc.Server;
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 
 import com.dmdirc.addons.dcc.ChatContainer;
 import com.dmdirc.addons.dcc.TransferContainer;

src/com/dmdirc/addons/identd/IdentdPlugin.java

 
 import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

 import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;

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

 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;

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

 import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;

src/com/dmdirc/addons/notifications/NotificationsPlugin.java

 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

 package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;

src/com/dmdirc/addons/parser_twitter/actions/TwitterActionComponents.java

 
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
-import com.dmdirc.actions.interfaces.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.addons.parser_twitter.Twitter;
 import com.dmdirc.addons.parser_twitter.api.TwitterStatus;
 import com.dmdirc.addons.parser_twitter.api.TwitterUser;

src/com/dmdirc/addons/parserdebug/DebugPlugin.java

 
 import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.plugins.BasePlugin;

src/com/dmdirc/addons/relaybot/RelayBotPlugin.java

 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;

src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java

 
 import com.dmdirc.Main;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BasePlugin;

src/com/dmdirc/addons/systray/SystrayPlugin.java

 package com.dmdirc.addons.systray;
 
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;

src/com/dmdirc/addons/time/TimeActionMetaType.java

 
 package com.dmdirc.addons.time;
 
-import com.dmdirc.actions.interfaces.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 
 import java.util.Calendar;
 

src/com/dmdirc/addons/time/TimeActionType.java

 
 package com.dmdirc.addons.time;
 
-import com.dmdirc.actions.interfaces.ActionMetaType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 /**
  * Lists the actions that the time plugin will raise.

src/com/dmdirc/addons/ui_dummy/DummyController.java

 import com.dmdirc.Server;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.core.components.StatusBarManager;
-import com.dmdirc.ui.interfaces.UIController;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.UIController;
+import com.dmdirc.interfaces.ui.Window;
 
 import java.net.URI;
 

src/com/dmdirc/addons/ui_dummy/DummyInputField.java

 
 package com.dmdirc.addons.ui_dummy;
 
-import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.event.ActionListener;
 import java.awt.event.KeyListener;

src/com/dmdirc/addons/ui_dummy/DummyInputHandler.java

 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.interfaces.ui.InputField;
 
 /**
  * Dummy input handler.

src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.interfaces.ui.InputWindow;
+import com.dmdirc.interfaces.ui.UIController;
 
 /**
  * Dummy input window, used for testing.

src/com/dmdirc/addons/ui_dummy/DummyStatusBar.java

 package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.ui.StatusMessage;
-import com.dmdirc.ui.interfaces.StatusBar;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBar;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 /**
  * Dummy status bar, used for testing.

src/com/dmdirc/addons/ui_swing/Apple.java

 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.commandparser.commands.global.NewServer;
 import com.dmdirc.config.IdentityManager;

src/com/dmdirc/addons/ui_swing/SwingController.java

 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.UIController;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.InputWindow;
+import com.dmdirc.interfaces.ui.UIController;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.ReturnableThread;
 import com.dmdirc.util.validators.NumericalValidator;

src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java

 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.ui.interfaces.FrameListener;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.FrameListener;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.util.ListenerList;
 
 import java.util.Arrays;

src/com/dmdirc/addons/ui_swing/actions/CommandAction.java

 package com.dmdirc.addons.ui_swing.actions;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.Window;
 
 import java.awt.event.ActionEvent;
 

src/com/dmdirc/addons/ui_swing/commands/Input.java

 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 
 /**
  * The input command allows you to manipulate text in a windows inputField.

src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

 import com.dmdirc.addons.ui_swing.textpane.TextPane;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.ui.interfaces.SearchBar;
-import com.dmdirc.ui.interfaces.SearchBar.Direction;
+import com.dmdirc.interfaces.ui.SearchBar;
+import com.dmdirc.interfaces.ui.SearchBar.Direction;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.IRCDocumentSearcher;
 import com.dmdirc.ui.messages.LinePosition;

src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.ActionListener;

src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

 import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.NickList;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.awt.BorderLayout;
 import java.awt.Point;

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.InputWindow;
+import com.dmdirc.interfaces.ui.Window;
 
 import java.awt.Point;
 import java.awt.event.KeyEvent;

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java

 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputField;
-import com.dmdirc.ui.interfaces.InputValidationListener;
+import com.dmdirc.interfaces.ui.InputField;
+import com.dmdirc.interfaces.ui.InputValidationListener;
 import com.dmdirc.util.ListenerList;
 import com.dmdirc.util.ReturnableThread;
 

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;

src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java

 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/components/inputfields/TextFieldInputField.java

 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/components/inputfields/TextPaneInputField.java

 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.KeyboardFocusManager;
 import java.awt.Window;

src/com/dmdirc/addons/ui_swing/components/inputfields/ValidatingTextFieldInputField.java

 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.util.validators.Validator;
 
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/components/renderers/ActionCellRenderer.java

 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.actions.interfaces.ActionComparison;
-import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.awt.Component;
 

src/com/dmdirc/addons/ui_swing/components/renderers/ActionComparisonCellRenderer.java

 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.actions.interfaces.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComparison;
 
 import java.awt.Component;
 

src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeRenderer.java

 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.awt.Component;
 

src/com/dmdirc/addons/ui_swing/components/renderers/ActionTypeTableCellRenderer.java

 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.awt.Color;
 import java.awt.Font;

src/com/dmdirc/addons/ui_swing/components/statusbar/FeedbackNag.java

 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;

src/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java

 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.StatusMessage;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 import java.awt.Window;
 import java.awt.event.MouseEvent;

src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPanel.java

 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 import java.awt.Color;
 import java.awt.event.MouseListener;

src/com/dmdirc/addons/ui_swing/components/statusbar/SwingStatusBar.java

 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.StatusMessage;
-import com.dmdirc.ui.interfaces.StatusBar;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBar;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 import java.awt.Component;
 import java.util.Arrays;

src/com/dmdirc/addons/ui_swing/components/statusbar/UpdaterLabel.java

 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateChecker.STATE;
 import com.dmdirc.updater.UpdateCheckerListener;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.java

 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.ImageToggleButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionEditorPanel.java

 
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.interfaces.ActionComparison;
-import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionCellRenderer;
 

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsListPanel.java

 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.beans.PropertyChangeEvent;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsPanel.java

 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ConditionTree;
 import com.dmdirc.actions.ConditionTreeFactory.ConditionTreeFactoryType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionSubstitutionsPanel.java

 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionSubstitutor;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.substitutions.Substitution;
 import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionLabel;
 import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionsPanel;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggerRemovalListener.java

 
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 /**
  * Action trigger removal listener.

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java

 
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.IdentityManager;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java

 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ActionTypeComparator;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.ComboBoxWidthModifier;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTypeModel.java

 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionTypeComparator;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.util.MapList;
 
 import java.awt.FontMetrics;

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionTableModel.java

 
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasSubstitutionsPanel.java

 
 import com.dmdirc.actions.ActionSubstitutor;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.substitutions.Substitution;
 import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionLabel;
 import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionsPanel;

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesManager;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.awt.Color;
 import java.awt.event.KeyEvent;

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java

 
 import com.dmdirc.Channel;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.Window;
 
 import java.awt.Color;
 import java.awt.Dimension;

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/FrameToggleButton.java

 package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.Window;
 import javax.swing.Icon;
 import javax.swing.JToggleButton;
 

src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.Window;
 
 import java.awt.event.KeyEvent;
 import java.util.HashMap;

src/com/dmdirc/addons/ui_swing/textpane/TextPane.java

 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.IRCDocumentListener;
 import com.dmdirc.ui.messages.LinePosition;

src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

 import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.interfaces.FirstRunWizard;
+import com.dmdirc.interfaces.ui.FirstRunWizard;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.awt.Dimension;

src/com/dmdirc/addons/ui_web/Client.java

 
 package com.dmdirc.addons.ui_web;
 
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.Window;
 
 import java.util.LinkedList;
 import java.util.List;

src/com/dmdirc/addons/ui_web/WebInterfacePlugin.java

 package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.plugins.BasePlugin;
-import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.interfaces.ui.UIController;
 
 import org.mortbay.jetty.Handler;
 

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

 import com.dmdirc.Server;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.ui.core.components.StatusBarManager;
-import com.dmdirc.ui.interfaces.UIController;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.UIController;
+import com.dmdirc.interfaces.ui.Window;
 
 import java.net.URI;
 

src/com/dmdirc/addons/ui_web/WebWindowManager.java

 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.ui.interfaces.FrameListener;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.FrameListener;
+import com.dmdirc.interfaces.ui.Window;
 
 import java.util.Arrays;
 import java.util.Collection;

src/com/dmdirc/addons/ui_web/uicomponents/WebInputField.java

 
 import com.dmdirc.addons.ui_web.Client;
 import com.dmdirc.addons.ui_web.Event;
-import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.event.ActionListener;
 import java.awt.event.KeyListener;

src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java

 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputField;
+import com.dmdirc.interfaces.ui.InputField;
 
 /**
  * An input handler for the web ui.

src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java

 import com.dmdirc.addons.ui_web.WebInterfaceUI;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.util.HashMap;
 import java.util.Map;

src/com/dmdirc/addons/ui_web/uicomponents/WebStatusBar.java

 import com.dmdirc.addons.ui_web.DynamicRequestHandler;
 import com.dmdirc.addons.ui_web.Event;
 import com.dmdirc.ui.StatusMessage;
-import com.dmdirc.ui.interfaces.StatusBar;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBar;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 /**
  * A status bar handler for the web UI.

src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java

 import com.dmdirc.addons.ui_web.WebInterfaceUI;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.FrameInfoListener;
-import com.dmdirc.ui.interfaces.UIController;
-import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.interfaces.ui.UIController;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.messages.IRCDocumentListener;
 import com.dmdirc.ui.messages.IRCTextAttribute;
 import com.dmdirc.ui.messages.Styliser;

src/com/dmdirc/addons/urlcatcher/UrlCatcherPlugin.java

 import com.dmdirc.Raw;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;

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

 
 package com.dmdirc.addons.userlevel;
 
-import com.dmdirc.actions.interfaces.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.parser.interfaces.ClientInfo;
 
 /**

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

 
 package com.dmdirc.addons.userlevel;
 
-import com.dmdirc.actions.interfaces.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 /**

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

 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionComponent;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;

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

 package com.dmdirc.addons.windowstatus;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.ui.interfaces.StatusBarComponent;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.ui.messages.Styliser;
 
 import javax.swing.BorderFactory;

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.interfaces.ui.InputWindow;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;

test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanelTest.java

 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.harness.ui.WindowButtonHandler;
 import java.util.ArrayList;
 import java.util.Arrays;
     private ActionGroup group;
     private Panel panel;
     private Table table;
-    
+
     @Before
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        
+
         action1 = mock(Action.class);
         when(action1.getName()).thenReturn("name 1");
         when(action1.getTriggers()).thenReturn(new ActionType[] {
             CoreActionType.ACTION_CREATED, CoreActionType.ACTION_DELETED,
         });
         when(action1.getResponse()).thenReturn(new String[] { "A" });
-                
+
         action2 = mock(Action.class);
         when(action2.getName()).thenReturn("name 2");
         when(action2.getTriggers()).thenReturn(new ActionType[] {
             CoreActionType.ACTION_CREATED
         });
         when(action2.getResponse()).thenReturn(new String[0]);
-        
+
         action3 = mock(Action.class);
         when(action3.getName()).thenReturn("name 3");
         when(action3.getTriggers()).thenReturn(new ActionType[] {
             "Response line 2",
             "Response line 3",
         });
-        
+
         action4 = mock(Action.class);
         when(action4.getName()).thenReturn("name 4");
         when(action4.getTriggers()).thenReturn(new ActionType[] {