diff --git a/sopel_modules/SpiceBot_Core_Commands/__init__.py b/sopel_modules/SpiceBot_Core_Commands/__init__.py
index 0136317..83d0712 100644
--- a/sopel_modules/SpiceBot_Core_Commands/__init__.py
+++ b/sopel_modules/SpiceBot_Core_Commands/__init__.py
@@ -19,11 +19,7 @@ from .Runtime_Controls import *
 from .Messaging import *
 from .Docs import *
 from .BotPrivs import *
-from .Search import *
 from .AI import *
-from .Gif import *
-from .Sherlock import *
-from .Reddit import *
 from .DictComs import *
 from .TODO import *
 
diff --git a/sopel_modules/SpiceBot_Core_Extra/__init__.py b/sopel_modules/SpiceBot_Core_Extra/__init__.py
new file mode 100644
index 0000000..cfa65c7
--- /dev/null
+++ b/sopel_modules/SpiceBot_Core_Extra/__init__.py
@@ -0,0 +1,9 @@
+# coding=utf8
+from __future__ import unicode_literals, absolute_import, division, print_function
+# pylama:ignore=W0401,W0611
+
+from .flip import *
+
+__author__ = 'Sam Zick'
+__email__ = 'sam@deathbybandaid.net'
+__version__ = '0.1.1'
diff --git a/sopel_modules/SpiceBot_Core_Extra/flip.py b/sopel_modules/SpiceBot_Core_Extra/flip.py
new file mode 100644
index 0000000..de10546
--- /dev/null
+++ b/sopel_modules/SpiceBot_Core_Extra/flip.py
@@ -0,0 +1,34 @@
+# coding=utf-8
+
+from __future__ import unicode_literals, absolute_import, division, print_function
+
+import sopel.module
+
+import sopel_modules.SpiceBot as SpiceBot
+
+from sopel_modules.spicemanip import spicemanip
+
+from upsidedown import transform
+# TODO add upsidedown to spicemanip
+
+
+@sopel.module.rule('^flips (.+)')
+@sopel.module.intent('ACTION')
+def flips(bot, trigger):
+    target = trigger.group(1).strip()
+    if target == 'a table':
+        bot.say("(╯°□°）╯︵ ┻━┻")
+    else:
+        bot.say("(╯°□°）╯︵ %s" % transform(target))
+
+
+@sopel.module.rule('^rolls (.+)')
+@sopel.module.intent('ACTION')
+def roll(bot, trigger):
+    target = trigger.group(1).strip()
+    if target.endswith(' down a hill'):
+        target = target[:-12]
+        tegrat = transform(target)
+        bot.say("(╮°-°)╯︵ %s %s %s %s %s (@_@;)" % (tegrat, target, tegrat, target, tegrat))
+    else:
+        bot.say("(╮°-°)╯︵ %s" % transform(target))
diff --git a/sopel_modules/SpiceBot_Core_Commands/Gif.py b/sopel_modules/SpiceBot_Core_Tools/Gif.py
similarity index 100%
rename from sopel_modules/SpiceBot_Core_Commands/Gif.py
rename to sopel_modules/SpiceBot_Core_Tools/Gif.py
diff --git a/sopel_modules/SpiceBot_Core_Commands/Reddit.py b/sopel_modules/SpiceBot_Core_Tools/Reddit.py
similarity index 100%
rename from sopel_modules/SpiceBot_Core_Commands/Reddit.py
rename to sopel_modules/SpiceBot_Core_Tools/Reddit.py
diff --git a/sopel_modules/SpiceBot_Core_Commands/Search.py b/sopel_modules/SpiceBot_Core_Tools/Search.py
similarity index 100%
rename from sopel_modules/SpiceBot_Core_Commands/Search.py
rename to sopel_modules/SpiceBot_Core_Tools/Search.py
diff --git a/sopel_modules/SpiceBot_Core_Commands/Sherlock.py b/sopel_modules/SpiceBot_Core_Tools/Sherlock.py
similarity index 100%
rename from sopel_modules/SpiceBot_Core_Commands/Sherlock.py
rename to sopel_modules/SpiceBot_Core_Tools/Sherlock.py
diff --git a/sopel_modules/SpiceBot_Core_Tools/__init__.py b/sopel_modules/SpiceBot_Core_Tools/__init__.py
new file mode 100644
index 0000000..4a70f4b
--- /dev/null
+++ b/sopel_modules/SpiceBot_Core_Tools/__init__.py
@@ -0,0 +1,12 @@
+# coding=utf8
+from __future__ import unicode_literals, absolute_import, division, print_function
+# pylama:ignore=W0401,W0611
+
+from .Gif import *
+from .Sherlock import *
+from .Reddit import *
+from .Search import *
+
+__author__ = 'Sam Zick'
+__email__ = 'sam@deathbybandaid.net'
+__version__ = '0.1.1'