diff --git a/chatter/__init__.py b/chatter/__init__.py
index 2d7a8e8..3056b82 100644
--- a/chatter/__init__.py
+++ b/chatter/__init__.py
@@ -1,5 +1,9 @@
-from .chatter import Chatter
-
+from .chat import Chatter
+from . import chatterbot
 
 def setup(bot):
     bot.add_cog(Chatter(bot))
+
+__all__ = (
+    'chatterbot'
+)
diff --git a/chatter/chatterbot/input/__init__.py b/chatter/chatterbot/input/__init__.py
index 625b583..53c53f9 100644
--- a/chatter/chatterbot/input/__init__.py
+++ b/chatter/chatterbot/input/__init__.py
@@ -1,6 +1,6 @@
+from .input_adapter import InputAdapter
 from .gitter import Gitter
 from .hipchat import HipChat
-from .input_adapter import InputAdapter
 from .mailgun import Mailgun
 from .microsoft import Microsoft
 from .terminal import TerminalAdapter
diff --git a/chatter/chatterbot/storage/__init__.py b/chatter/chatterbot/storage/__init__.py
index c456292..77d3e04 100644
--- a/chatter/chatterbot/storage/__init__.py
+++ b/chatter/chatterbot/storage/__init__.py
@@ -1,6 +1,6 @@
+from .storage_adapter import StorageAdapter
 from .mongodb import MongoDatabaseAdapter
 from .sql_storage import SQLStorageAdapter
-from .storage_adapter import StorageAdapter
 
 __all__ = (
     'StorageAdapter',