diff --git a/core/__init__.py b/bot/__init__.py
similarity index 100%
rename from core/__init__.py
rename to bot/__init__.py
diff --git a/lib/blowfish.py b/bot/blowfish.py
similarity index 100%
rename from lib/blowfish.py
rename to bot/blowfish.py
diff --git a/irc/classes/__init__.py b/bot/classes/__init__.py
similarity index 78%
rename from irc/classes/__init__.py
rename to bot/classes/__init__.py
index b92db69..95da576 100644
--- a/irc/classes/__init__.py
+++ b/bot/classes/__init__.py
@@ -1,4 +1,5 @@
 from base_command import *
+from base_task import *
 from connection import *
 from data import *
 from rc import *
diff --git a/irc/classes/base_command.py b/bot/classes/base_command.py
similarity index 100%
rename from irc/classes/base_command.py
rename to bot/classes/base_command.py
diff --git a/wiki/base_task.py b/bot/classes/base_task.py
similarity index 100%
rename from wiki/base_task.py
rename to bot/classes/base_task.py
diff --git a/irc/classes/connection.py b/bot/classes/connection.py
similarity index 100%
rename from irc/classes/connection.py
rename to bot/classes/connection.py
diff --git a/irc/classes/data.py b/bot/classes/data.py
similarity index 100%
rename from irc/classes/data.py
rename to bot/classes/data.py
diff --git a/irc/classes/rc.py b/bot/classes/rc.py
similarity index 100%
rename from irc/classes/rc.py
rename to bot/classes/rc.py
diff --git a/irc/command_handler.py b/bot/commands/__init__.py
similarity index 100%
rename from irc/command_handler.py
rename to bot/commands/__init__.py
diff --git a/irc/commands/_old.py b/bot/commands/_old.py
similarity index 100%
rename from irc/commands/_old.py
rename to bot/commands/_old.py
diff --git a/irc/commands/afc_report.py b/bot/commands/afc_report.py
similarity index 100%
rename from irc/commands/afc_report.py
rename to bot/commands/afc_report.py
diff --git a/irc/commands/afc_status.py b/bot/commands/afc_status.py
similarity index 100%
rename from irc/commands/afc_status.py
rename to bot/commands/afc_status.py
diff --git a/irc/commands/calc.py b/bot/commands/calc.py
similarity index 100%
rename from irc/commands/calc.py
rename to bot/commands/calc.py
diff --git a/irc/commands/chanops.py b/bot/commands/chanops.py
similarity index 100%
rename from irc/commands/chanops.py
rename to bot/commands/chanops.py
diff --git a/irc/commands/crypt.py b/bot/commands/crypt.py
similarity index 100%
rename from irc/commands/crypt.py
rename to bot/commands/crypt.py
diff --git a/irc/commands/git.py b/bot/commands/git.py
similarity index 100%
rename from irc/commands/git.py
rename to bot/commands/git.py
diff --git a/irc/commands/help.py b/bot/commands/help.py
similarity index 100%
rename from irc/commands/help.py
rename to bot/commands/help.py
diff --git a/irc/commands/link.py b/bot/commands/link.py
similarity index 100%
rename from irc/commands/link.py
rename to bot/commands/link.py
diff --git a/irc/commands/remind.py b/bot/commands/remind.py
similarity index 100%
rename from irc/commands/remind.py
rename to bot/commands/remind.py
diff --git a/irc/commands/rights.py b/bot/commands/rights.py
similarity index 100%
rename from irc/commands/rights.py
rename to bot/commands/rights.py
diff --git a/irc/commands/tasks.py b/bot/commands/tasks.py
similarity index 100%
rename from irc/commands/tasks.py
rename to bot/commands/tasks.py
diff --git a/irc/commands/test.py b/bot/commands/test.py
similarity index 100%
rename from irc/commands/test.py
rename to bot/commands/test.py
diff --git a/core/config.py b/bot/config.py
similarity index 100%
rename from core/config.py
rename to bot/config.py
diff --git a/irc/frontend.py b/bot/frontend.py
similarity index 100%
rename from irc/frontend.py
rename to bot/frontend.py
diff --git a/core/main.py b/bot/main.py
similarity index 100%
rename from core/main.py
rename to bot/main.py
diff --git a/wiki/task_manager.py b/bot/tasks/__init__.py
similarity index 100%
rename from wiki/task_manager.py
rename to bot/tasks/__init__.py
diff --git a/wiki/tasks/afc_catdelink.py b/bot/tasks/afc_catdelink.py
similarity index 100%
rename from wiki/tasks/afc_catdelink.py
rename to bot/tasks/afc_catdelink.py
diff --git a/wiki/tasks/afc_copyvios.py b/bot/tasks/afc_copyvios.py
similarity index 100%
rename from wiki/tasks/afc_copyvios.py
rename to bot/tasks/afc_copyvios.py
diff --git a/wiki/tasks/afc_dailycats.py b/bot/tasks/afc_dailycats.py
similarity index 100%
rename from wiki/tasks/afc_dailycats.py
rename to bot/tasks/afc_dailycats.py
diff --git a/wiki/tasks/afc_statistics.py b/bot/tasks/afc_statistics.py
similarity index 100%
rename from wiki/tasks/afc_statistics.py
rename to bot/tasks/afc_statistics.py
diff --git a/wiki/tasks/afc_undated.py b/bot/tasks/afc_undated.py
similarity index 100%
rename from wiki/tasks/afc_undated.py
rename to bot/tasks/afc_undated.py
diff --git a/wiki/tasks/blptag.py b/bot/tasks/blptag.py
similarity index 100%
rename from wiki/tasks/blptag.py
rename to bot/tasks/blptag.py
diff --git a/wiki/tasks/feed_dailycats.py b/bot/tasks/feed_dailycats.py
similarity index 100%
rename from wiki/tasks/feed_dailycats.py
rename to bot/tasks/feed_dailycats.py
diff --git a/wiki/tasks/wrongmime.py b/bot/tasks/wrongmime.py
similarity index 100%
rename from wiki/tasks/wrongmime.py
rename to bot/tasks/wrongmime.py
diff --git a/irc/watcher.py b/bot/watcher.py
similarity index 100%
rename from irc/watcher.py
rename to bot/watcher.py
diff --git a/irc/watcher_logic.py b/bot/watcher_logic.py
similarity index 100%
rename from irc/watcher_logic.py
rename to bot/watcher_logic.py
diff --git a/wiki/tools/__init__.py b/bot/wiki/__init__.py
similarity index 100%
rename from wiki/tools/__init__.py
rename to bot/wiki/__init__.py
diff --git a/wiki/tools/category.py b/bot/wiki/category.py
similarity index 100%
rename from wiki/tools/category.py
rename to bot/wiki/category.py
diff --git a/wiki/tools/constants.py b/bot/wiki/constants.py
similarity index 100%
rename from wiki/tools/constants.py
rename to bot/wiki/constants.py
diff --git a/wiki/tools/exceptions.py b/bot/wiki/exceptions.py
similarity index 100%
rename from wiki/tools/exceptions.py
rename to bot/wiki/exceptions.py
diff --git a/wiki/tools/functions.py b/bot/wiki/functions.py
similarity index 100%
rename from wiki/tools/functions.py
rename to bot/wiki/functions.py
diff --git a/wiki/tools/page.py b/bot/wiki/page.py
similarity index 100%
rename from wiki/tools/page.py
rename to bot/wiki/page.py
diff --git a/wiki/tools/site.py b/bot/wiki/site.py
similarity index 100%
rename from wiki/tools/site.py
rename to bot/wiki/site.py
diff --git a/wiki/tools/user.py b/bot/wiki/user.py
similarity index 100%
rename from wiki/tools/user.py
rename to bot/wiki/user.py
diff --git a/irc/__init__.py b/irc/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/irc/commands/__init__.py b/irc/commands/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/__init__.py b/lib/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/wiki/__init__.py b/wiki/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/wiki/tasks/__init__.py b/wiki/tasks/__init__.py
deleted file mode 100644
index e69de29..0000000