diff --git a/onionr/__init__.py b/onionr/__init__.py
index 00760db7..400e218f 100755
--- a/onionr/__init__.py
+++ b/onionr/__init__.py
@@ -49,7 +49,7 @@ from utils import createdirs
 createdirs.create_dirs()
 
 from onionrcommands import parser
-import onionrevents as events
+from onionrplugins import onionrevents as events
 
 setup.setup_config()
 setup.setup_default_plugins()
diff --git a/onionr/communicator/__init__.py b/onionr/communicator/__init__.py
index 5dfaf053..50d889e4 100755
--- a/onionr/communicator/__init__.py
+++ b/onionr/communicator/__init__.py
@@ -20,7 +20,9 @@
 '''
 import sys, os, time
 import config, logger
-import onionrexceptions, onionrpeers, onionrevents as events, onionrplugins as plugins, onionrblockapi as block
+import onionrexceptions, onionrpeers, onionrblockapi as block
+from onionrplugins import onionrevents as events
+import onionrplugins as plugins
 from . import onlinepeers, uploadqueue
 from communicatorutils import servicecreator, onionrcommunicatortimers
 from communicatorutils import downloadblocks, lookupblocks, lookupadders
diff --git a/onionr/communicatorutils/daemonqueuehandler.py b/onionr/communicatorutils/daemonqueuehandler.py
index 71f4cb26..0cd881fb 100755
--- a/onionr/communicatorutils/daemonqueuehandler.py
+++ b/onionr/communicatorutils/daemonqueuehandler.py
@@ -18,7 +18,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 import logger
-import onionrevents as events
+from onionrplugins import onionrevents as events
 from onionrutils import localcommand
 from coredb import daemonqueue
 import filepaths
diff --git a/onionr/coredb/daemonqueue/__init__.py b/onionr/coredb/daemonqueue/__init__.py
index 34c2324c..d2e058a8 100644
--- a/onionr/coredb/daemonqueue/__init__.py
+++ b/onionr/coredb/daemonqueue/__init__.py
@@ -19,7 +19,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 import sqlite3, os
-import onionrevents as events
+from onionrplugins import onionrevents as events
 from onionrutils import localcommand, epoch
 from .. import dbfiles
 import dbcreator
diff --git a/onionr/coredb/keydb/addkeys.py b/onionr/coredb/keydb/addkeys.py
index f62b10cf..0d6a390e 100644
--- a/onionr/coredb/keydb/addkeys.py
+++ b/onionr/coredb/keydb/addkeys.py
@@ -18,7 +18,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 import sqlite3
-import onionrevents as events
+from onionrplugins import onionrevents as events
 from onionrutils import stringvalidators
 from . import listkeys
 from utils import gettransports
diff --git a/onionr/coredb/keydb/removekeys.py b/onionr/coredb/keydb/removekeys.py
index 67961bcc..e4585b41 100644
--- a/onionr/coredb/keydb/removekeys.py
+++ b/onionr/coredb/keydb/removekeys.py
@@ -18,7 +18,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 import sqlite3
-import onionrevents as events
+from onionrplugins import onionrevents as events
 from onionrutils import stringvalidators
 from .. import dbfiles
 def remove_address(address):
diff --git a/onionr/onionrblocks/insert.py b/onionr/onionrblocks/insert.py
index b99333ab..2801d3ae 100644
--- a/onionr/onionrblocks/insert.py
+++ b/onionr/onionrblocks/insert.py
@@ -2,7 +2,7 @@ from typing import Union
 import json
 from onionrutils import bytesconverter, epoch
 import storagecounter, filepaths, onionrstorage
-import onionrevents as events
+from onionrplugins import onionrevents as events
 from etc import powchoice, onionrvalues
 import config, onionrcrypto as crypto, subprocesspow, onionrexceptions
 from onionrusers import onionrusers
diff --git a/onionr/onionrcommands/README.md b/onionr/onionrcommands/README.md
index fed35bb5..1b83a1c5 100755
--- a/onionr/onionrcommands/README.md
+++ b/onionr/onionrcommands/README.md
@@ -4,6 +4,8 @@ This module contains handlers/functions for Onionr cli interface commands.
 
 ## Files
 
+parser/: Registers and handles Onionr CLI commands
+
 __init__.py: stores the command references (aside from plugins) and help info.
 
 banblocks.py: command handler for manually removing blocks from one's node
diff --git a/onionr/onionrcommands/daemonlaunch.py b/onionr/onionrcommands/daemonlaunch.py
index b6d5802a..12d5fda1 100755
--- a/onionr/onionrcommands/daemonlaunch.py
+++ b/onionr/onionrcommands/daemonlaunch.py
@@ -24,7 +24,7 @@ from threading import Thread
 import toomanyobjs
 
 import config, apiservers, logger, communicator
-import onionrevents as events
+from onionrplugins import onionrevents as events
 from netcontroller import NetController
 from onionrutils import localcommand
 import filepaths
diff --git a/onionr/onionrcommands/parser/__init__.py b/onionr/onionrcommands/parser/__init__.py
index 22c7cd69..ead84558 100644
--- a/onionr/onionrcommands/parser/__init__.py
+++ b/onionr/onionrcommands/parser/__init__.py
@@ -21,12 +21,12 @@ import sys
 from etc import onionrvalues
 import logger, onionrexceptions
 import onionrplugins
-import onionrpluginapi
+from onionrplugins import onionrpluginapi
 from . import arguments, recommend
 
 plugin_command = lambda cmd: 'on_%s_cmd' % (cmd,)
 
-def register_plugin_commands(cmd):
+def register_plugin_commands(cmd)->bool:
     plugin_cmd = plugin_command(cmd)
     for pl in onionrplugins.get_enabled_plugins():
         pl = onionrplugins.get_plugin(pl)
diff --git a/onionr/onionrcommands/parser/arguments.py b/onionr/onionrcommands/parser/arguments.py
index bce3f40a..ae2dcbcc 100644
--- a/onionr/onionrcommands/parser/arguments.py
+++ b/onionr/onionrcommands/parser/arguments.py
@@ -29,7 +29,8 @@ from .. import softreset # command to delete onionr blocks
 from .. import restartonionr # command to restart Onionr
 import onionrexceptions
 from onionrutils import importnewblocks # func to import new blocks
-import onionrevents as events
+from onionrplugins import onionrevents as events
+
 def get_arguments()->dict:
     """This is a function because we need to be able to dynamically modify them with plugins"""
     args = {
diff --git a/onionr/onionrcommands/softreset.py b/onionr/onionrcommands/softreset.py
index 913d6950..abdf1c84 100644
--- a/onionr/onionrcommands/softreset.py
+++ b/onionr/onionrcommands/softreset.py
@@ -23,7 +23,7 @@ import shutil
 from onionrutils import localcommand
 from coredb import dbfiles
 import filepaths
-import onionrevents
+from onionrplugins import onionrevents
 import logger
 
 def _ignore_not_found_delete(path):
diff --git a/onionr/onionrplugins.py b/onionr/onionrplugins/__init__.py
similarity index 99%
rename from onionr/onionrplugins.py
rename to onionr/onionrplugins/__init__.py
index 4045dfcf..7c70484c 100755
--- a/onionr/onionrplugins.py
+++ b/onionr/onionrplugins/__init__.py
@@ -18,7 +18,9 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 import os, re, importlib
-import onionrevents as events, config, logger
+
+from . import onionrevents as events
+import config, logger
 from utils import identifyhome
 
 # set data dir
diff --git a/onionr/onionrevents.py b/onionr/onionrplugins/onionrevents.py
similarity index 96%
rename from onionr/onionrevents.py
rename to onionr/onionrplugins/onionrevents.py
index e50aab27..2680cad2 100755
--- a/onionr/onionrevents.py
+++ b/onionr/onionrplugins/onionrevents.py
@@ -17,10 +17,13 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
-
-import config, logger, onionrplugins as plugins, onionrpluginapi as pluginapi
 from threading import Thread
 
+import config, logger
+import onionrplugins as plugins
+from . import onionrpluginapi as pluginapi
+
+
 def get_pluginapi(data):
     return pluginapi.SharedAPI(data)
 
diff --git a/onionr/onionrpluginapi.py b/onionr/onionrplugins/onionrpluginapi.py
similarity index 100%
rename from onionr/onionrpluginapi.py
rename to onionr/onionrplugins/onionrpluginapi.py
diff --git a/onionr/onionrsetup/defaultpluginsetup.py b/onionr/onionrsetup/defaultpluginsetup.py
index 28b5cbc3..4509e072 100644
--- a/onionr/onionrsetup/defaultpluginsetup.py
+++ b/onionr/onionrsetup/defaultpluginsetup.py
@@ -1,5 +1,27 @@
+"""
+    Onionr - Private P2P Communication
+
+    Installs default plugins
+"""
+"""
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+"""
 import os, shutil
-import onionrplugins as plugins, logger
+
+import onionrplugins as plugins
+import logger
+
 def setup_default_plugins():
     # Copy default plugins into plugins folder
     if not os.path.exists(plugins.get_plugins_folder()):
@@ -18,4 +40,4 @@ def setup_default_plugins():
                 os.mkdir(plugins.get_plugin_data_folder(name))
             except Exception as e:
                 #logger.warn('Error enabling plugin: ' + str(e), terminal=True)
-                plugins.disable(name, stop_event = False)
\ No newline at end of file
+                plugins.disable(name, stop_event = False)
diff --git a/onionr/onionrutils/blockmetadata/process.py b/onionr/onionrutils/blockmetadata/process.py
index 5164c794..39abe1bb 100644
--- a/onionr/onionrutils/blockmetadata/process.py
+++ b/onionr/onionrutils/blockmetadata/process.py
@@ -23,7 +23,7 @@ import onionrblockapi
 from .. import epoch, bytesconverter
 from coredb import blockmetadb
 import logger
-import onionrevents
+from onionrplugins import onionrevents
 import onionrexceptions
 from onionrusers import onionrusers