diff --git a/setup.cfg b/setup.cfg
index 50c88e9..63ed808 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,5 +22,6 @@ install_requires =
 
 [options.entry_points]
 sopel.plugins =
-    SpiceBotCore = sopel_SpiceBotCore
-    SpiceBotStartup = sopel_SpiceBotStartup
+    SpiceBotCore = sopel_SpiceBot_Core_1
+    SpiceBotPrerun = sopel_SpiceBot_Core_Prerun
+    SpiceBotStartup = sopel_SpiceBot_Core_Startup
diff --git a/sopel_SpiceBotCore/SBCore/__init__.py b/sopel_SpiceBot_Core_1/SBCore/__init__.py
similarity index 100%
rename from sopel_SpiceBotCore/SBCore/__init__.py
rename to sopel_SpiceBot_Core_1/SBCore/__init__.py
diff --git a/sopel_SpiceBotCore/SBCore/interface/comms/__init__.py b/sopel_SpiceBot_Core_1/SBCore/interface/comms/__init__.py
similarity index 100%
rename from sopel_SpiceBotCore/SBCore/interface/comms/__init__.py
rename to sopel_SpiceBot_Core_1/SBCore/interface/comms/__init__.py
diff --git a/sopel_SpiceBotCore/SBCore/interface/config/__init__.py b/sopel_SpiceBot_Core_1/SBCore/interface/config/__init__.py
similarity index 100%
rename from sopel_SpiceBotCore/SBCore/interface/config/__init__.py
rename to sopel_SpiceBot_Core_1/SBCore/interface/config/__init__.py
diff --git a/sopel_SpiceBotCore/SBCore/interface/database/__init__.py b/sopel_SpiceBot_Core_1/SBCore/interface/database/__init__.py
similarity index 100%
rename from sopel_SpiceBotCore/SBCore/interface/database/__init__.py
rename to sopel_SpiceBot_Core_1/SBCore/interface/database/__init__.py
diff --git a/sopel_SpiceBotCore/SBCore/interface/events/__init__.py b/sopel_SpiceBot_Core_1/SBCore/interface/events/__init__.py
similarity index 100%
rename from sopel_SpiceBotCore/SBCore/interface/events/__init__.py
rename to sopel_SpiceBot_Core_1/SBCore/interface/events/__init__.py
diff --git a/sopel_SpiceBotCore/SBCore/interface/logger/__init__.py b/sopel_SpiceBot_Core_1/SBCore/interface/logger/__init__.py
similarity index 100%
rename from sopel_SpiceBotCore/SBCore/interface/logger/__init__.py
rename to sopel_SpiceBot_Core_1/SBCore/interface/logger/__init__.py
diff --git a/sopel_SpiceBotCore/SBCore/interface/versions/__init__.py b/sopel_SpiceBot_Core_1/SBCore/interface/versions/__init__.py
similarity index 100%
rename from sopel_SpiceBotCore/SBCore/interface/versions/__init__.py
rename to sopel_SpiceBot_Core_1/SBCore/interface/versions/__init__.py
diff --git a/sopel_SpiceBotCore/__init__.py b/sopel_SpiceBot_Core_1/__init__.py
similarity index 50%
rename from sopel_SpiceBotCore/__init__.py
rename to sopel_SpiceBot_Core_1/__init__.py
index aa17094..ca32962 100644
--- a/sopel_SpiceBotCore/__init__.py
+++ b/sopel_SpiceBot_Core_1/__init__.py
@@ -7,10 +7,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 import os
 import pathlib
 
-from sopel import plugin
-
 from .SBCore import SpiceBotCore_OBJ
-from .SBCore.prerun import prerun
 
 SCRIPT_DIR = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
 
@@ -19,13 +16,3 @@ sb = SpiceBotCore_OBJ(SCRIPT_DIR)
 
 def setup(bot):
     sb.setup(bot)
-
-
-@prerun('nickname')
-@plugin.nickname_command('test')
-def sb_nickname_command(bot, trigger, sb):
-    bot.say("Testing the bot")
-    bot.say("Attributes: %s" % [x for x in dir(sb) if not x.startswith("__")])
-    bot.say("%s" % sb.versions.dict)
-
-    sb.osd("test", trigger.sender)
diff --git a/sopel_SpiceBotCore/version.json b/sopel_SpiceBot_Core_1/version.json
similarity index 100%
rename from sopel_SpiceBotCore/version.json
rename to sopel_SpiceBot_Core_1/version.json
diff --git a/sopel_SpiceBotCore/SBCore/prerun.py b/sopel_SpiceBot_Core_Prerun/__init__.py
similarity index 91%
rename from sopel_SpiceBotCore/SBCore/prerun.py
rename to sopel_SpiceBot_Core_Prerun/__init__.py
index 8568a51..2f6a1c4 100644
--- a/sopel_SpiceBotCore/SBCore/prerun.py
+++ b/sopel_SpiceBot_Core_Prerun/__init__.py
@@ -1,6 +1,6 @@
 import functools
 
-from sopel_SpiceBotCore import sb
+from sopel_SpiceBot_Core_1 import sb
 
 
 def prerun(t_command_type='module'):
diff --git a/sopel_SpiceBotStartup/__init__.py b/sopel_SpiceBot_Core_Startup/__init__.py
similarity index 98%
rename from sopel_SpiceBotStartup/__init__.py
rename to sopel_SpiceBot_Core_Startup/__init__.py
index e5a6aa2..20d3ee0 100644
--- a/sopel_SpiceBotStartup/__init__.py
+++ b/sopel_SpiceBot_Core_Startup/__init__.py
@@ -8,7 +8,7 @@ from threading import Thread
 
 from sopel import plugin
 
-from sopel_SpiceBotCore import sb
+from sopel_SpiceBot_Core_1 import sb
 
 
 """
diff --git a/sopel_SpiceBot_Runtime_Commands/__init__.py b/sopel_SpiceBot_Runtime_Commands/__init__.py
new file mode 100644
index 0000000..c55f7cd
--- /dev/null
+++ b/sopel_SpiceBot_Runtime_Commands/__init__.py
@@ -0,0 +1,15 @@
+
+
+from sopel import plugin
+
+from sopel_SpiceBot_Core_1.SBCore.prerun import prerun
+
+
+@prerun('nickname')
+@plugin.nickname_command('test')
+def sb_nickname_command(bot, trigger, sb):
+    bot.say("Testing the bot")
+    bot.say("Attributes: %s" % [x for x in dir(sb) if not x.startswith("__")])
+    bot.say("%s" % sb.versions.dict)
+
+    sb.osd("test", trigger.sender)