diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a5aa1b9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.*.swp
+Session.vim
diff --git a/HsbotIrcBot/.gitignore b/HsbotIrcBot/.gitignore
new file mode 100644
index 0000000..a5aa1b9
--- /dev/null
+++ b/HsbotIrcBot/.gitignore
@@ -0,0 +1,2 @@
+.*.swp
+Session.vim
diff --git a/HsbotIrcBot/Hsbot/.gitignore b/HsbotIrcBot/Hsbot/.gitignore
new file mode 100644
index 0000000..a5aa1b9
--- /dev/null
+++ b/HsbotIrcBot/Hsbot/.gitignore
@@ -0,0 +1,2 @@
+.*.swp
+Session.vim
diff --git a/HsbotIrcBot/Hsbot/Irc/.gitignore b/HsbotIrcBot/Hsbot/Irc/.gitignore
new file mode 100644
index 0000000..a5aa1b9
--- /dev/null
+++ b/HsbotIrcBot/Hsbot/Irc/.gitignore
@@ -0,0 +1,2 @@
+.*.swp
+Session.vim
diff --git a/Hsbot/Irc/Command.hs b/HsbotIrcBot/Hsbot/Irc/Command.hs
similarity index 100%
rename from Hsbot/Irc/Command.hs
rename to HsbotIrcBot/Hsbot/Irc/Command.hs
diff --git a/Hsbot/Irc/Config.hs b/HsbotIrcBot/Hsbot/Irc/Config.hs
similarity index 100%
rename from Hsbot/Irc/Config.hs
rename to HsbotIrcBot/Hsbot/Irc/Config.hs
diff --git a/Hsbot/Irc/Core.hs b/HsbotIrcBot/Hsbot/Irc/Core.hs
similarity index 100%
rename from Hsbot/Irc/Core.hs
rename to HsbotIrcBot/Hsbot/Irc/Core.hs
diff --git a/Hsbot/Irc/Message.hs b/HsbotIrcBot/Hsbot/Irc/Message.hs
similarity index 100%
rename from Hsbot/Irc/Message.hs
rename to HsbotIrcBot/Hsbot/Irc/Message.hs
diff --git a/Hsbot/Irc/Plugin.hs b/HsbotIrcBot/Hsbot/Irc/Plugin.hs
similarity index 100%
rename from Hsbot/Irc/Plugin.hs
rename to HsbotIrcBot/Hsbot/Irc/Plugin.hs
diff --git a/Hsbot/Irc/Plugin/Core.hs b/HsbotIrcBot/Hsbot/Irc/Plugin/Core.hs
similarity index 100%
rename from Hsbot/Irc/Plugin/Core.hs
rename to HsbotIrcBot/Hsbot/Irc/Plugin/Core.hs
diff --git a/Hsbot/Irc/Plugin/Dummy.hs b/HsbotIrcBot/Hsbot/Irc/Plugin/Dummy.hs
similarity index 100%
rename from Hsbot/Irc/Plugin/Dummy.hs
rename to HsbotIrcBot/Hsbot/Irc/Plugin/Dummy.hs
diff --git a/Hsbot/Irc/Plugin/Ping.hs b/HsbotIrcBot/Hsbot/Irc/Plugin/Ping.hs
similarity index 100%
rename from Hsbot/Irc/Plugin/Ping.hs
rename to HsbotIrcBot/Hsbot/Irc/Plugin/Ping.hs
diff --git a/Hsbot/Irc/Plugin/Quote.hs b/HsbotIrcBot/Hsbot/Irc/Plugin/Quote.hs
similarity index 100%
rename from Hsbot/Irc/Plugin/Quote.hs
rename to HsbotIrcBot/Hsbot/Irc/Plugin/Quote.hs
diff --git a/Hsbot/Irc/Plugin/Utils.hs b/HsbotIrcBot/Hsbot/Irc/Plugin/Utils.hs
similarity index 100%
rename from Hsbot/Irc/Plugin/Utils.hs
rename to HsbotIrcBot/Hsbot/Irc/Plugin/Utils.hs
diff --git a/Hsbot/Irc/Server.hs b/HsbotIrcBot/Hsbot/Irc/Server.hs
similarity index 100%
rename from Hsbot/Irc/Server.hs
rename to HsbotIrcBot/Hsbot/Irc/Server.hs
diff --git a/Hsbot/Irc/Types.hs b/HsbotIrcBot/Hsbot/Irc/Types.hs
similarity index 100%
rename from Hsbot/Irc/Types.hs
rename to HsbotIrcBot/Hsbot/Irc/Types.hs
diff --git a/Hsbot/Irc/doc/rfc2812.txt b/HsbotIrcBot/Hsbot/Irc/doc/rfc2812.txt
similarity index 100%
rename from Hsbot/Irc/doc/rfc2812.txt
rename to HsbotIrcBot/Hsbot/Irc/doc/rfc2812.txt
diff --git a/Setup.hs b/HsbotIrcBot/Setup.hs
similarity index 100%
rename from Setup.hs
rename to HsbotIrcBot/Setup.hs
diff --git a/HsbotMaster/.gitignore b/HsbotMaster/.gitignore
new file mode 100644
index 0000000..a5aa1b9
--- /dev/null
+++ b/HsbotMaster/.gitignore
@@ -0,0 +1,2 @@
+.*.swp
+Session.vim
diff --git a/HsbotMaster/Hsbot/.gitignore b/HsbotMaster/Hsbot/.gitignore
new file mode 100644
index 0000000..a5aa1b9
--- /dev/null
+++ b/HsbotMaster/Hsbot/.gitignore
@@ -0,0 +1,2 @@
+.*.swp
+Session.vim
diff --git a/Hsbot/Config.hs b/HsbotMaster/Hsbot/Config.hs
similarity index 100%
rename from Hsbot/Config.hs
rename to HsbotMaster/Hsbot/Config.hs
diff --git a/Hsbot/Core.hs b/HsbotMaster/Hsbot/Core.hs
similarity index 100%
rename from Hsbot/Core.hs
rename to HsbotMaster/Hsbot/Core.hs
diff --git a/Hsbot/Message.hs b/HsbotMaster/Hsbot/Message.hs
similarity index 100%
rename from Hsbot/Message.hs
rename to HsbotMaster/Hsbot/Message.hs
diff --git a/Hsbot/Plugin.hs b/HsbotMaster/Hsbot/Plugin.hs
similarity index 100%
rename from Hsbot/Plugin.hs
rename to HsbotMaster/Hsbot/Plugin.hs
diff --git a/Hsbot/PluginUtils.hs b/HsbotMaster/Hsbot/PluginUtils.hs
similarity index 100%
rename from Hsbot/PluginUtils.hs
rename to HsbotMaster/Hsbot/PluginUtils.hs
diff --git a/Hsbot/Types.hs b/HsbotMaster/Hsbot/Types.hs
similarity index 100%
rename from Hsbot/Types.hs
rename to HsbotMaster/Hsbot/Types.hs
diff --git a/Main.hs b/HsbotMaster/Main.hs
similarity index 100%
rename from Main.hs
rename to HsbotMaster/Main.hs
diff --git a/HsbotMaster/Setup.hs b/HsbotMaster/Setup.hs
new file mode 100644
index 0000000..14a7f90
--- /dev/null
+++ b/HsbotMaster/Setup.hs
@@ -0,0 +1,5 @@
+#!/usr/bin/env runhaskell
+
+import Distribution.Simple
+
+main = defaultMain
diff --git a/hsbot.cabal b/HsbotMaster/hsbot.cabal
similarity index 100%
rename from hsbot.cabal
rename to HsbotMaster/hsbot.cabal