diff --git a/deluge/ui/console/modes/addtorrents.py b/deluge/ui/console/modes/addtorrents.py
index 036fd6cc4..e79093108 100644
--- a/deluge/ui/console/modes/addtorrents.py
+++ b/deluge/ui/console/modes/addtorrents.py
@@ -14,10 +14,10 @@ import os
 import deluge.common as common
 import deluge.component as component
 from deluge.ui.client import client
-from deluge.ui.console import format_utils
-from deluge.ui.console.basemode import BaseMode
-from deluge.ui.console.input_popup import InputPopup
-from deluge.ui.console.popup import MessagePopup
+from deluge.ui.console.modes import format_utils
+from deluge.ui.console.modes.basemode import BaseMode
+from deluge.ui.console.modes.input_popup import InputPopup
+from deluge.ui.console.modes.popup import MessagePopup
 
 try:
     import curses
diff --git a/deluge/ui/console/modes/alltorrents.py b/deluge/ui/console/modes/alltorrents.py
index 57dc95ebe..4b3796b48 100644
--- a/deluge/ui/console/modes/alltorrents.py
+++ b/deluge/ui/console/modes/alltorrents.py
@@ -12,19 +12,19 @@ from collections import deque
 
 import deluge.common
 import deluge.component as component
-import deluge.ui.console.column
+import deluge.ui.console.modes.column
 from deluge.configmanager import ConfigManager
 from deluge.ui.client import client
-from deluge.ui.console import format_utils
-from deluge.ui.console.addtorrents import AddTorrents
-from deluge.ui.console.basemode import BaseMode
-from deluge.ui.console.eventview import EventView
-from deluge.ui.console.input_popup import InputPopup
-from deluge.ui.console.legacy import Legacy
-from deluge.ui.console.popup import MessagePopup, Popup, SelectablePopup
-from deluge.ui.console.preferences import Preferences
-from deluge.ui.console.torrent_actions import ACTION, torrent_actions_popup
-from deluge.ui.console.torrentdetail import TorrentDetail
+from deluge.ui.console.modes import format_utils
+from deluge.ui.console.modes.addtorrents import AddTorrents
+from deluge.ui.console.modes.basemode import BaseMode
+from deluge.ui.console.modes.eventview import EventView
+from deluge.ui.console.modes.input_popup import InputPopup
+from deluge.ui.console.modes.legacy import Legacy
+from deluge.ui.console.modes.popup import MessagePopup, Popup, SelectablePopup
+from deluge.ui.console.modes.preferences import Preferences
+from deluge.ui.console.modes.torrent_actions import ACTION, torrent_actions_popup
+from deluge.ui.console.modes.torrentdetail import TorrentDetail
 
 try:
     import curses
@@ -365,7 +365,7 @@ class AllTorrents(BaseMode, component.Component):
                                if ("show_%s" % pref) not in self.config or self.config["show_%s" % pref]]
 
         self.__columns = [prefs_to_names[col] for col in self.__cols_to_show]
-        self.__status_fields = deluge.ui.console.column.get_required_fields(self.__columns)
+        self.__status_fields = deluge.ui.console.modes.column.get_required_fields(self.__columns)
 
         # we always need these, even if we're not displaying them
         for rf in ["state", "name", "queue", "progress"]:
@@ -870,7 +870,7 @@ class AllTorrents(BaseMode, component.Component):
             #Because dots are slow
             sorted_ids = self._sorted_ids
             curstate = self.curstate
-            gcv = deluge.ui.console.column.get_column_value
+            gcv = deluge.ui.console.modes.column.get_column_value
             fr = format_utils.format_row
             cols = self.__columns
             colw = self.column_widths
diff --git a/deluge/ui/console/modes/column.py b/deluge/ui/console/modes/column.py
index d4b78f147..81c0a7e89 100644
--- a/deluge/ui/console/modes/column.py
+++ b/deluge/ui/console/modes/column.py
@@ -10,7 +10,7 @@
 import logging
 
 import deluge.common
-from deluge.ui.console import format_utils
+from deluge.ui.console.modes import format_utils
 
 log = logging.getLogger(__name__)
 
diff --git a/deluge/ui/console/modes/connectionmanager.py b/deluge/ui/console/modes/connectionmanager.py
index 2d1352c2a..c86c2ae66 100644
--- a/deluge/ui/console/modes/connectionmanager.py
+++ b/deluge/ui/console/modes/connectionmanager.py
@@ -17,10 +17,10 @@ from collections import deque
 import deluge.component as component
 from deluge.configmanager import ConfigManager
 from deluge.ui.client import Client, client
-from deluge.ui.console.alltorrents import AllTorrents
-from deluge.ui.console.basemode import BaseMode
-from deluge.ui.console.input_popup import InputPopup
-from deluge.ui.console.popup import MessagePopup, SelectablePopup
+from deluge.ui.console.modes.alltorrents import AllTorrents
+from deluge.ui.console.modes.basemode import BaseMode
+from deluge.ui.console.modes.input_popup import InputPopup
+from deluge.ui.console.modes.popup import MessagePopup, SelectablePopup
 
 try:
     import curses
diff --git a/deluge/ui/console/modes/eventview.py b/deluge/ui/console/modes/eventview.py
index eb2987415..39a4321dc 100644
--- a/deluge/ui/console/modes/eventview.py
+++ b/deluge/ui/console/modes/eventview.py
@@ -11,8 +11,8 @@ import logging
 
 import deluge.component as component
 from deluge.ui.client import client
-from deluge.ui.console import format_utils
-from deluge.ui.console.basemode import BaseMode
+from deluge.ui.console.modes import format_utils
+from deluge.ui.console.modes.basemode import BaseMode
 
 try:
     import curses
diff --git a/deluge/ui/console/modes/input_popup.py b/deluge/ui/console/modes/input_popup.py
index b44b520a2..8c6d7b47d 100644
--- a/deluge/ui/console/modes/input_popup.py
+++ b/deluge/ui/console/modes/input_popup.py
@@ -19,7 +19,7 @@ import os
 import os.path
 
 from deluge.ui.console import colors
-from deluge.ui.console.popup import ALIGN, Popup
+from deluge.ui.console.modes.popup import ALIGN, Popup
 
 log = logging.getLogger(__name__)
 
diff --git a/deluge/ui/console/modes/legacy.py b/deluge/ui/console/modes/legacy.py
index 20fdcd5d6..92707e658 100644
--- a/deluge/ui/console/modes/legacy.py
+++ b/deluge/ui/console/modes/legacy.py
@@ -24,8 +24,8 @@ import deluge.component as component
 import deluge.configmanager
 import deluge.ui.console.colors as colors
 from deluge.ui.client import client
-from deluge.ui.console.basemode import BaseMode
 from deluge.ui.console.modes import format_utils
+from deluge.ui.console.modes.basemode import BaseMode
 
 strwidth = format_utils.strwidth
 
diff --git a/deluge/ui/console/modes/popup.py b/deluge/ui/console/modes/popup.py
index 0979220a7..ae2382913 100644
--- a/deluge/ui/console/modes/popup.py
+++ b/deluge/ui/console/modes/popup.py
@@ -14,7 +14,7 @@ except ImportError:
 
 import logging
 
-from deluge.ui.console import format_utils
+from deluge.ui.console.modes import format_utils
 
 log = logging.getLogger(__name__)
 
diff --git a/deluge/ui/console/modes/preferences.py b/deluge/ui/console/modes/preferences.py
index b90d5a687..f9ae46066 100644
--- a/deluge/ui/console/modes/preferences.py
+++ b/deluge/ui/console/modes/preferences.py
@@ -12,11 +12,11 @@ from collections import deque
 
 import deluge.component as component
 from deluge.ui.client import client
-from deluge.ui.console.basemode import BaseMode
-from deluge.ui.console.input_popup import Popup, SelectInput
-from deluge.ui.console.popup import MessagePopup
-from deluge.ui.console.preference_panes import (BandwidthPane, CachePane, ColumnsPane, DaemonPane, DownloadsPane,
-                                                InterfacePane, NetworkPane, OtherPane, ProxyPane, QueuePane)
+from deluge.ui.console.modes.basemode import BaseMode
+from deluge.ui.console.modes.input_popup import Popup, SelectInput
+from deluge.ui.console.modes.popup import MessagePopup
+from deluge.ui.console.modes.preference_panes import (BandwidthPane, CachePane, ColumnsPane, DaemonPane, DownloadsPane,
+                                                      InterfacePane, NetworkPane, OtherPane, ProxyPane, QueuePane)
 
 try:
     import curses
diff --git a/deluge/ui/console/modes/torrent_actions.py b/deluge/ui/console/modes/torrent_actions.py
index afef14963..f27c6b31a 100644
--- a/deluge/ui/console/modes/torrent_actions.py
+++ b/deluge/ui/console/modes/torrent_actions.py
@@ -14,8 +14,8 @@ from twisted.internet import defer
 import deluge.component as component
 from deluge.ui.client import client
 from deluge.ui.console import colors
-from deluge.ui.console.input_popup import InputPopup
-from deluge.ui.console.popup import Popup, SelectablePopup
+from deluge.ui.console.modes.input_popup import InputPopup
+from deluge.ui.console.modes.popup import Popup, SelectablePopup
 
 log = logging.getLogger(__name__)
 
diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py
index e432a6d9e..61e359dbf 100644
--- a/deluge/ui/console/modes/torrentdetail.py
+++ b/deluge/ui/console/modes/torrentdetail.py
@@ -14,11 +14,12 @@ from sys import maxint
 import deluge.component as component
 from deluge.common import fdate, FILE_PRIORITY, fsize, ftime
 from deluge.ui.client import client
-from deluge.ui.console import colors, format_utils
-from deluge.ui.console.basemode import BaseMode
-from deluge.ui.console.input_popup import InputPopup
-from deluge.ui.console.popup import MessagePopup, SelectablePopup
-from deluge.ui.console.torrent_actions import ACTION, torrent_actions_popup
+from deluge.ui.console import colors
+from deluge.ui.console.modes import format_utils
+from deluge.ui.console.modes.basemode import BaseMode
+from deluge.ui.console.modes.input_popup import InputPopup
+from deluge.ui.console.modes.popup import MessagePopup, SelectablePopup
+from deluge.ui.console.modes.torrent_actions import ACTION, torrent_actions_popup
 
 try:
     import curses