diff --git a/irc/classes/__init__.py b/irc/classes/__init__.py
new file mode 100644
index 0000000..b92db69
--- /dev/null
+++ b/irc/classes/__init__.py
@@ -0,0 +1,4 @@
+from base_command import *
+from connection import *
+from data import *
+from rc import *
diff --git a/irc/base_command.py b/irc/classes/base_command.py
similarity index 100%
rename from irc/base_command.py
rename to irc/classes/base_command.py
diff --git a/irc/connection.py b/irc/classes/connection.py
similarity index 100%
rename from irc/connection.py
rename to irc/classes/connection.py
diff --git a/irc/data.py b/irc/classes/data.py
similarity index 100%
rename from irc/data.py
rename to irc/classes/data.py
diff --git a/irc/rc.py b/irc/classes/rc.py
similarity index 100%
rename from irc/rc.py
rename to irc/classes/rc.py
diff --git a/irc/commands/afc_status.py b/irc/commands/afc_status.py
index dd0248c..6a7f720 100644
--- a/irc/commands/afc_status.py
+++ b/irc/commands/afc_status.py
@@ -6,7 +6,7 @@ import json
 import re
 import urllib
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 
 class AFCStatus(BaseCommand):
     def get_hooks(self):
diff --git a/irc/commands/calc.py b/irc/commands/calc.py
index ceaca78..fbd26a1 100644
--- a/irc/commands/calc.py
+++ b/irc/commands/calc.py
@@ -5,7 +5,7 @@
 import re
 import urllib
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 
 class Calc(BaseCommand):
     def get_hooks(self):
diff --git a/irc/commands/chanops.py b/irc/commands/chanops.py
index a2a9cc6..1bd7a8d 100644
--- a/irc/commands/chanops.py
+++ b/irc/commands/chanops.py
@@ -2,7 +2,7 @@
 
 # Voice/devoice/op/deop users in the channel.
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 from core import config
 
 class ChanOps(BaseCommand):
diff --git a/irc/commands/git.py b/irc/commands/git.py
index a919904..4d09d9c 100644
--- a/irc/commands/git.py
+++ b/irc/commands/git.py
@@ -2,9 +2,11 @@
 
 # Commands to interface with the bot's git repository; use '!git help' for sub-command list.
 
-import shlex, subprocess, re
+import shlex
+import subprocess
+import re
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 from core import config
 
 class Git(BaseCommand):
diff --git a/irc/commands/help.py b/irc/commands/help.py
index 1970337..54eefa2 100644
--- a/irc/commands/help.py
+++ b/irc/commands/help.py
@@ -2,8 +2,7 @@
 
 # Generates help information.
 
-from irc.base_command import BaseCommand
-from irc.data import Data
+from irc.classes import BaseCommand, Data
 from irc import command_handler
 
 class Help(BaseCommand):
diff --git a/irc/commands/link.py b/irc/commands/link.py
index 59f2d6e..4587451 100644
--- a/irc/commands/link.py
+++ b/irc/commands/link.py
@@ -4,7 +4,7 @@
 
 import re
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 
 class Link(BaseCommand):
     def get_hooks(self):
diff --git a/irc/commands/tasks.py b/irc/commands/tasks.py
index 58050d0..5dba593 100644
--- a/irc/commands/tasks.py
+++ b/irc/commands/tasks.py
@@ -5,8 +5,7 @@
 import threading
 import re
 
-from irc.base_command import BaseCommand
-from irc.data import *
+from irc.classes import BaseCommand, Data, KwargParseException
 from wiki import task_manager
 from core import config
 
diff --git a/irc/commands/test.py b/irc/commands/test.py
index 69ecd2f..630a37f 100644
--- a/irc/commands/test.py
+++ b/irc/commands/test.py
@@ -4,7 +4,7 @@
 
 import random
 
-from irc.base_command import BaseCommand
+from irc.classes import BaseCommand
 
 class Test(BaseCommand):
     def get_hooks(self):
diff --git a/irc/frontend.py b/irc/frontend.py
index 38d326a..56a6f17 100644
--- a/irc/frontend.py
+++ b/irc/frontend.py
@@ -13,8 +13,7 @@ from re import findall
 
 from core import config
 from irc import command_handler
-from irc.connection import *
-from irc.data import Data
+from irc.classes import Connection, Data, BrokenSocketException
 
 connection = None
 
diff --git a/irc/watcher.py b/irc/watcher.py
index bbc17c9..c39f47c 100644
--- a/irc/watcher.py
+++ b/irc/watcher.py
@@ -11,8 +11,7 @@ channels in the IRC frontend.
 """
 
 from core import config
-from irc.connection import *
-from irc.rc import RC
+from irc.classes import Connection, RC, BrokenSocketException
 from irc import watcher_logic
 
 frontend_conn = None