diff --git a/rsbbs/__init__.py b/rsbbs/__init__.py
index b865e6c..49f4fa5 100644
--- a/rsbbs/__init__.py
+++ b/rsbbs/__init__.py
@@ -20,11 +20,3 @@ __all__ = ['config', 'console', 'controller',
            'logger', 'models', 'parser', 'pluginloader']
 
 __version__ = "0.4.0"
-
-from .config import Config
-from .console import Console
-from .controller import Controller
-from .logger import Logger
-from .parser import Parser
-from .pluginloader import PluginLoader
-from .user import User
diff --git a/rsbbs/console.py b/rsbbs/console.py
index a2d564f..0ba9252 100644
--- a/rsbbs/console.py
+++ b/rsbbs/console.py
@@ -20,7 +20,10 @@ import logging
 import sys
 
 import rsbbs
-from rsbbs import Config, Controller
+from rsbbs.config import Config
+from rsbbs.controller import Controller
+from rsbbs.parser import Parser
+from rsbbs.pluginloader import PluginLoader
 from rsbbs.models import User
 
 
@@ -34,9 +37,9 @@ class Console():
         self.controller = controller
         self.user = user
 
-        self.parser = rsbbs.Parser()
+        self.parser = Parser()
 
-        self.pluginloader = rsbbs.PluginLoader(self)
+        self.pluginloader = PluginLoader(self)
         self.pluginloader.load_plugins()
 
     #
diff --git a/rsbbs/controller.py b/rsbbs/controller.py
index bb0779f..1feec6d 100644
--- a/rsbbs/controller.py
+++ b/rsbbs/controller.py
@@ -19,7 +19,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import Session
 
-from rsbbs import Config
+from rsbbs.config import Config
 from rsbbs.models import Base
 
 
diff --git a/rsbbs/rsbbs.py b/rsbbs/rsbbs.py
index 0e985d2..f267a3a 100755
--- a/rsbbs/rsbbs.py
+++ b/rsbbs/rsbbs.py
@@ -18,7 +18,10 @@
 
 import logging
 
-from rsbbs import Config, Console, Controller, Logger
+from rsbbs.config import Config
+from rsbbs.console import Console
+from rsbbs.controller import Controller
+from rsbbs.logger import Logger
 
 from rsbbs.args import parse_args
 
@@ -26,6 +29,10 @@ from rsbbs.user import User
 
 
 def main():
+    """RSBBS - The BBS for packet radio that is really simple.
+
+    main function.
+    """
 
     # Grab the invocation arguments
     args = parse_args()
diff --git a/rsbbs/user.py b/rsbbs/user.py
index 789ec12..0ffdf58 100644
--- a/rsbbs/user.py
+++ b/rsbbs/user.py
@@ -23,7 +23,8 @@ from typing import Any
 
 from datetime import datetime, timezone
 
-from rsbbs import Config, Controller
+from rsbbs.config import Config
+from rsbbs.controller import Controller
 from rsbbs.models import User as SAUser