11 files changed, 89 insertions, 28 deletions
diff --git a/src/modules/catserv/Makefile b/src/modules/catserv/Makefile
new file mode 100644
index 000000000..5b2f4efa3
--- /dev/null
+++ b/src/modules/catserv/Makefile
@@ -0,0 +1,9 @@
+SRCS= ircd_catserv.c \
+      catserv_messages.c \
+      meow.c \
+      purr.c
+
+TARGET=ircd_catserv
+
+include ../Makefile.sub
+
diff --git a/src/modules/catserv/README b/src/modules/catserv/README
new file mode 100644
index 000000000..c3d3f7084
--- /dev/null
+++ b/src/modules/catserv/README
@@ -0,0 +1,4 @@
+This is an EXAMPLE module, it serves no real purpose.
+
+This module was broken down into multiple files to demonstrate how multiple files can be used.
+
diff --git a/src/modules/catserv/catserv_extern.h b/src/modules/catserv/catserv_extern.h
new file mode 100644
index 000000000..08c76da17
--- /dev/null
+++ b/src/modules/catserv/catserv_extern.h
@@ -0,0 +1,7 @@
+#ifndef CATSERV_DEFS_H
+#define CATSERV_DEFS_H
+
+E char *s_CatServ;
+
+#endif
+
diff --git a/src/modules/catserv/catserv_messages.c b/src/modules/catserv/catserv_messages.c
new file mode 100644
index 000000000..e11235b4e
--- /dev/null
+++ b/src/modules/catserv/catserv_messages.c
@@ -0,0 +1,14 @@
+#include "catserv_messages.h"
+#include "module.h"
+#include "meow.h"
+#include "purr.h"
+
+void addMessageList(void)
+{
+    Command *c;
+    c = createCommand("meow", do_meow, NULL, -1, -1, -1, -1, -1);
+    moduleAddCommand(Catserv_cmdTable, c, MOD_UNIQUE);
+    c = createCommand("purr", do_purr, NULL, -1, -1, -1, -1, -1);
+    moduleAddCommand(Catserv_cmdTable, c, MOD_UNIQUE);
+}
+
diff --git a/src/modules/catserv/catserv_messages.h b/src/modules/catserv/catserv_messages.h
new file mode 100644
index 000000000..bb3f82dd0
--- /dev/null
+++ b/src/modules/catserv/catserv_messages.h
@@ -0,0 +1,10 @@
+#ifndef CATSERV_MESSAGES_H
+#define CATSERV_MESSAGES_H
+
+#include "module.h"
+
+CommandHash *Catserv_cmdTable[MAX_CMD_HASH];
+void addMessageList(void);
+
+#endif
+
diff --git a/src/modules/ircd_catserv.c b/src/modules/catserv/ircd_catserv.c
index c6f5e5b7b..2fa7b52b3 100644
--- a/src/modules/ircd_catserv.c
+++ b/src/modules/catserv/ircd_catserv.c
@@ -7,30 +7,28 @@
  **/
 
 #include "module.h"
+#include "catserv_messages.h"
 
 #define AUTHOR "Anope"
 #define VERSION "1.2"
 
 int my_privmsg(char *source, int ac, char **av);
-CommandHash *Catserv_cmdTable[MAX_CMD_HASH];
 
 void addClient(char *nick, char *realname);
-void addMessageList(void);
 void delClient(void);
-char *s_CatServ = "CatServ";
 void catserv(User * u, char *buf);
 
-int do_meow(User * u);
-int do_purr(User * u);
+char *s_CatServ = "CatServ";
 
 int AnopeInit(int argc, char **argv)
 {
     Message *msg = NULL;
     int status;
 #ifdef IRC_UNREAL32
-     msg = createMessage("PRIVMSG", my_privmsg);
     if (UseTokens) {
      msg = createMessage("!", my_privmsg);
+    } else {
+     msg = createMessage("PRIVMSG", my_privmsg);
     }
 #else
     msg = createMessage("PRIVMSG", my_privmsg);
@@ -91,15 +89,6 @@ void delClient(void)
     anope_cmd_quit(s_CatServ, "QUIT :Module Unloaded!");
 }
 
-void addMessageList(void)
-{
-    Command *c;
-    c = createCommand("meow", do_meow, NULL, -1, -1, -1, -1, -1);
-    moduleAddCommand(Catserv_cmdTable, c, MOD_UNIQUE);
-    c = createCommand("purr", do_purr, NULL, -1, -1, -1, -1, -1);
-    moduleAddCommand(Catserv_cmdTable, c, MOD_UNIQUE);
-}
-
 /*****************************************************************************/
 /* Main CatServ routine. */
 void catserv(User * u, char *buf)
@@ -121,15 +110,3 @@ void catserv(User * u, char *buf)
     }
 }
 
-int do_meow(User * u)
-{
-    notice(s_CatServ, u->nick, "MEOW!");
-    return MOD_STOP;
-}
-
-int do_purr(User * u)
-{
-    notice(s_CatServ, u->nick, "PURR!");
-    return MOD_STOP;
-}
-
diff --git a/src/modules/catserv/meow.c b/src/modules/catserv/meow.c
new file mode 100644
index 000000000..9279eec0b
--- /dev/null
+++ b/src/modules/catserv/meow.c
@@ -0,0 +1,9 @@
+#include "meow.h"
+
+#include "catserv_extern.h"
+
+int do_meow(User * u) {
+	notice(s_CatServ, u->nick, "MEOW!");
+	return MOD_STOP;
+}
+
diff --git a/src/modules/catserv/meow.h b/src/modules/catserv/meow.h
new file mode 100644
index 000000000..0f28673a0
--- /dev/null
+++ b/src/modules/catserv/meow.h
@@ -0,0 +1,9 @@
+#ifndef CATSERV_MEOW_H
+#define CATSERV_MEOW_H
+
+#include "module.h"
+
+int do_meow(User * u);
+
+#endif
+
diff --git a/src/modules/catserv/purr.c b/src/modules/catserv/purr.c
new file mode 100644
index 000000000..5a39dc26e
--- /dev/null
+++ b/src/modules/catserv/purr.c
@@ -0,0 +1,8 @@
+#include "purr.h"
+#include "catserv_extern.h"
+
+int do_purr(User * u)
+{
+    notice(s_CatServ, u->nick, "PURR!");
+    return MOD_STOP;
+}
diff --git a/src/modules/catserv/purr.h b/src/modules/catserv/purr.h
new file mode 100644
index 000000000..a92e421f6
--- /dev/null
+++ b/src/modules/catserv/purr.h
@@ -0,0 +1,9 @@
+#ifndef CATSERV_PURR_H
+#define CATSERV_PURR_H
+
+#include "module.h"
+
+int do_purr(User * u);
+
+#endif
+
diff --git a/version.log b/version.log
index 7b41c8d36..34e87fde0 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,15 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="8"
-VERSION_BUILD="583"
+VERSION_BUILD="584"
 
 # $Log$
 #
+# BUILD : 1.7.8 (584)
+# BUGS  : N/A
+# NOTES : Removed ircd_catserv.c and added ./src/modules/catserv/ subfolder
+# 
+#
 # BUILD : 1.7.8 (583)
 # BUGS  : N/A
 # NOTES : Added multifile module support for nix, win32 will follow