diff --git a/rsbbs/__init__.py b/rsbbs/__init__.py
index 3718de2..e375bc2 100644
--- a/rsbbs/__init__.py
+++ b/rsbbs/__init__.py
@@ -17,12 +17,13 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 __all__ = ['config', 'console', 'controller',
-           'logger', 'parser', 'pluginloader']
+           'logger', 'models', 'parser', 'pluginloader']
 
 __version__ = "0.3.0"
 
-# from .config import Config
-# from .console import Console
-# from .controller import Controller
-# from .parser import Parser
-# from .pluginloader import PluginLoader
+from .config import Config
+from .console import Console
+from .controller import Controller
+from .logger import Logger
+from .parser import Parser
+from .pluginloader import PluginLoader
diff --git a/rsbbs/console.py b/rsbbs/console.py
index 109d06c..473f917 100644
--- a/rsbbs/console.py
+++ b/rsbbs/console.py
@@ -20,10 +20,7 @@ import logging
 import sys
 
 import rsbbs
-from rsbbs.config import Config
-from rsbbs.controller import Controller
-from rsbbs.parser import Parser
-from rsbbs.pluginloader import PluginLoader
+from rsbbs import Config, Controller, Parser, PluginLoader
 
 
 # Main UI console class
@@ -34,9 +31,9 @@ class Console():
         self.config = config
         self.controller = controller
 
-        self.parser = Parser()
+        self.parser = rsbbs.Parser()
 
-        self.pluginloader = PluginLoader(self)
+        self.pluginloader = rsbbs.PluginLoader(self)
         self.pluginloader.load_plugins()
 
     #
diff --git a/rsbbs/controller.py b/rsbbs/controller.py
index 8e98e29..e440439 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.config import Config
+from rsbbs import Config
 from rsbbs.models import Base
 
 
diff --git a/rsbbs/logger.py b/rsbbs/logger.py
index ba40343..f0a8a2c 100644
--- a/rsbbs/logger.py
+++ b/rsbbs/logger.py
@@ -23,7 +23,7 @@ import os
 import platformdirs
 
 
-class RSLogger(logging.Logger):
+class Logger(logging.Logger):
     def __init__(self, config):
         super().__init__(name=config.app_name)
         self.config = config
@@ -55,13 +55,13 @@ class RSLogger(logging.Logger):
         handler = logging.FileHandler(filename=log_filepath)
 
         # Add the calling station to the log messages
-        handler.setFormatter(RSFormatter(self.caller))
+        handler.setFormatter(Formatter(self.caller))
 
         # Add the handler!
         logger.addHandler(handler)
 
 
-class RSFormatter(logging.Formatter):
+class Formatter(logging.Formatter):
     def __init__(self, var):
         super().__init__()
         self.var = var
diff --git a/rsbbs/plugins/bye/plugin.py b/rsbbs/plugins/bye/plugin.py
index f58114d..f8a8363 100644
--- a/rsbbs/plugins/bye/plugin.py
+++ b/rsbbs/plugins/bye/plugin.py
@@ -18,8 +18,7 @@
 
 import logging
 
-from rsbbs.console import Console
-from rsbbs.parser import Parser
+from rsbbs import Console, Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/delete/plugin.py b/rsbbs/plugins/delete/plugin.py
index dea387f..6d08691 100644
--- a/rsbbs/plugins/delete/plugin.py
+++ b/rsbbs/plugins/delete/plugin.py
@@ -21,9 +21,8 @@ import logging
 import sqlalchemy
 import sqlalchemy.exc
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/deletem/plugin.py b/rsbbs/plugins/deletem/plugin.py
index 0af85e0..14b4ae2 100644
--- a/rsbbs/plugins/deletem/plugin.py
+++ b/rsbbs/plugins/deletem/plugin.py
@@ -19,9 +19,8 @@
 import logging
 import sqlalchemy
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/heard/plugin.py b/rsbbs/plugins/heard/plugin.py
index b7696e3..c747251 100644
--- a/rsbbs/plugins/heard/plugin.py
+++ b/rsbbs/plugins/heard/plugin.py
@@ -19,8 +19,7 @@
 import logging
 import subprocess
 
-from rsbbs.console import Console
-from rsbbs.parser import Parser
+from rsbbs import Console, Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/help/plugin.py b/rsbbs/plugins/help/plugin.py
index 266ebc5..33b34fe 100644
--- a/rsbbs/plugins/help/plugin.py
+++ b/rsbbs/plugins/help/plugin.py
@@ -16,8 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from rsbbs.console import Console
-from rsbbs.parser import Parser
+from rsbbs import Console, Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/list/plugin.py b/rsbbs/plugins/list/plugin.py
index 1d723da..1a2f2d6 100644
--- a/rsbbs/plugins/list/plugin.py
+++ b/rsbbs/plugins/list/plugin.py
@@ -19,9 +19,8 @@
 import logging
 import sqlalchemy
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/listm/plugin.py b/rsbbs/plugins/listm/plugin.py
index e7c963c..d7b0797 100644
--- a/rsbbs/plugins/listm/plugin.py
+++ b/rsbbs/plugins/listm/plugin.py
@@ -19,9 +19,8 @@
 import logging
 import sqlalchemy
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/read/plugin.py b/rsbbs/plugins/read/plugin.py
index a387cfe..54ea009 100644
--- a/rsbbs/plugins/read/plugin.py
+++ b/rsbbs/plugins/read/plugin.py
@@ -20,9 +20,8 @@ import logging
 import sqlalchemy
 import sqlalchemy.exc
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/readm/plugin.py b/rsbbs/plugins/readm/plugin.py
index 4ee10df..47cda8c 100644
--- a/rsbbs/plugins/readm/plugin.py
+++ b/rsbbs/plugins/readm/plugin.py
@@ -19,9 +19,8 @@
 import logging
 import sqlalchemy
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/send/plugin.py b/rsbbs/plugins/send/plugin.py
index aebcf47..46e0ddf 100644
--- a/rsbbs/plugins/send/plugin.py
+++ b/rsbbs/plugins/send/plugin.py
@@ -18,9 +18,8 @@
 
 import logging
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():
diff --git a/rsbbs/plugins/sendp/plugin.py b/rsbbs/plugins/sendp/plugin.py
index e0075ce..ff4dc66 100644
--- a/rsbbs/plugins/sendp/plugin.py
+++ b/rsbbs/plugins/sendp/plugin.py
@@ -18,9 +18,8 @@
 
 import logging
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():
diff --git a/rsbbs/rsbbs.py b/rsbbs/rsbbs.py
index 62dd43f..90a0cbb 100755
--- a/rsbbs/rsbbs.py
+++ b/rsbbs/rsbbs.py
@@ -21,10 +21,7 @@ import logging
 import sys
 
 from rsbbs import __version__
-from rsbbs.config import Config
-from rsbbs.console import Console
-from rsbbs.controller import Controller
-from rsbbs.logger import RSLogger
+from rsbbs import Config, Console, Controller, Logger
 
 
 def parse_args():
@@ -96,7 +93,7 @@ def main():
            args=args)
 
     # Start logging
-    logger = RSLogger(config)
+    logger = Logger(config)
     logging.info(f"caller connected")
 
     # Init the controller