Convert all of ChanServ. I feel like Rob mkII!

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1549 5417fbe8-f217-4b02-8779-1006273d7864

23 files changed, 434 insertions, 766 deletions

diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index 5d1621972..c4361deba 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -21,42 +21,27 @@ int do_levels(User * u);
 
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSAccess : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion
-        ("$Id$");
-    moduleSetType(CORE);
-
-    c = createCommand("ACCESS", do_access, NULL, CHAN_HELP_ACCESS, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("ACCESS LEVELS", NULL, NULL, CHAN_HELP_ACCESS_LEVELS,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("LEVELS", do_levels, NULL, CHAN_HELP_LEVELS, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    moduleSetChanHelp(myChanServHelp);
+ public:
+	CSAccess(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    return MOD_CONT;
-}
+		moduleAddAuthor("Anope");
+		moduleAddVersion
+		("$Id$");
+		moduleSetType(CORE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		c = createCommand("ACCESS", do_access, NULL, CHAN_HELP_ACCESS, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("ACCESS LEVELS", NULL, NULL, CHAN_HELP_ACCESS_LEVELS, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("LEVELS", do_levels, NULL, CHAN_HELP_LEVELS, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -542,4 +527,4 @@ int do_levels(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_access")
+MODULE_INIT(CSAccess)
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 2c1e050d6..7882aef73 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -20,36 +20,23 @@ int do_akick(User * u);
 void myChanServHelp(User * u);
 int get_access_nc(NickCore *nc, ChannelInfo *ci);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSAKick : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSAKick(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("AKICK", do_akick, NULL, CHAN_HELP_AKICK, -1, -1, -1,
-                      -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("AKICK", do_akick, NULL, CHAN_HELP_AKICK, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -666,6 +653,5 @@ int get_access_nc(NickCore *nc, ChannelInfo *ci)
     return 0;
 }
 
-/* EOF */
 
-MODULE_INIT("cs_akick")
+MODULE_INIT(CSAKick)
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index c3ea133e2..88ce7f58c 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -19,39 +19,25 @@ int do_unban(User * u);
 int do_ban(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSBan : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
-
-    c = createCommand("BAN", do_ban, NULL, CHAN_HELP_BAN, -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("UNBAN", do_unban, NULL, CHAN_HELP_UNBAN, -1, -1, -1,
-                      -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+ public:
+	CSBan(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-}
+		c = createCommand("BAN", do_ban, NULL, CHAN_HELP_BAN, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("UNBAN", do_unban, NULL, CHAN_HELP_UNBAN, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 /**
@@ -227,4 +213,4 @@ int do_unban(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_ban")
+MODULE_INIT(CSBan)
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 303d11a42..307afc2df 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -18,36 +18,23 @@
 int do_clear(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSClear : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSClear(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("CLEAR", do_clear, NULL, CHAN_HELP_CLEAR, -1, -1, -1,
-                      -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("CLEAR", do_clear, NULL, CHAN_HELP_CLEAR, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -371,4 +358,4 @@ int do_clear(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_clear")
+MODULE_INIT(CSClear)
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index 93607ace1..212a09f14 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -18,36 +18,24 @@
 int do_drop(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSDrop : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSDrop(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("DROP", do_drop, NULL, -1, CHAN_HELP_DROP, -1,
-                      CHAN_SERVADMIN_HELP_DROP, CHAN_SERVADMIN_HELP_DROP);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("DROP", do_drop, NULL, -1, CHAN_HELP_DROP, -1, CHAN_SERVADMIN_HELP_DROP, CHAN_SERVADMIN_HELP_DROP);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
-}
 
 
 
@@ -127,4 +115,4 @@ int do_drop(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_drop")
+MODULE_INIT(CSDrop)
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 5bee0ade4..930fa54e2 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -18,37 +18,24 @@
 int do_forbid(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSForbid : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSForbid(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1,
-                      CHAN_SERVADMIN_HELP_FORBID,
-                      CHAN_SERVADMIN_HELP_FORBID);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_FORBID, CHAN_SERVADMIN_HELP_FORBID);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
-}
 
 /**
  * Add the help response to anopes /cs help output.
@@ -138,4 +125,4 @@ int do_forbid(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_forbid")
+MODULE_INIT(CSForbid)
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index 2fe928c43..405ebfccf 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -18,36 +18,23 @@
 int do_getkey(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSGetKey : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSGetKey(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("GETKEY", do_getkey, NULL, CHAN_HELP_GETKEY, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("GETKEY", do_getkey, NULL, CHAN_HELP_GETKEY, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -87,4 +74,4 @@ int do_getkey(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_getkey")
+MODULE_INIT(CSGetKey)
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index 64113e5a6..7c46c5e8a 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -18,37 +18,23 @@
 int do_getpass(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSGetPass : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSGetPass(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1,
-                      CHAN_SERVADMIN_HELP_GETPASS,
-                      CHAN_SERVADMIN_HELP_GETPASS);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_GETPASS, CHAN_SERVADMIN_HELP_GETPASS);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -101,4 +87,4 @@ int do_getpass(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_getpass")
+MODULE_INIT(CSGetPass)
diff --git a/src/core/cs_help.c b/src/core/cs_help.c
index 8b7449c3d..2eff7139a 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.c
@@ -17,33 +17,21 @@
 
 int do_help(User * u);
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSHelp : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSHelp(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-
-    return MOD_CONT;
-}
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+	}
+};
 
 /**
  * The /cs help command.
@@ -83,4 +71,4 @@ int do_help(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_help")
+MODULE_INIT(CSHelp)
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index c8fad675e..7b27ce133 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -18,40 +18,26 @@
 int do_identify(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSIdentify : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSIdentify(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("IDENTIFY", do_identify, NULL, CHAN_HELP_IDENTIFY,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    c = createCommand("ID", do_identify, NULL, CHAN_HELP_IDENTIFY, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("IDENTIFY", do_identify, NULL, CHAN_HELP_IDENTIFY, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("ID", do_identify, NULL, CHAN_HELP_IDENTIFY, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -116,4 +102,4 @@ int do_identify(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_identify")
+MODULE_INIT(CSIdentify)
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 58972a0b3..95990f289 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -18,37 +18,23 @@
 int do_info(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSInfo : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSInfo(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("INFO", do_info, NULL, CHAN_HELP_INFO, -1,
-                      CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO,
-                      CHAN_SERVADMIN_HELP_INFO);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("INFO", do_info, NULL, CHAN_HELP_INFO, -1, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -248,4 +234,4 @@ int do_info(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_info")
+MODULE_INIT(CSInfo)
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index d37f6087b..192dbf874 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -18,36 +18,23 @@
 void myChanServHelp(User * u);
 int do_invite(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSInvite : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSInvite(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("INVITE", do_invite, NULL, CHAN_HELP_INVITE, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("INVITE", do_invite, NULL, CHAN_HELP_INVITE, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -89,4 +76,4 @@ int do_invite(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_invite")
+MODULE_INIT(CSInvite)
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index 4cc6681a2..a896a5d5b 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -18,36 +18,23 @@
 int do_cs_kick(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSKick : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSKick(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("KICK", do_cs_kick, NULL, CHAN_HELP_KICK, -1, -1, -1,
-                      -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("KICK", do_cs_kick, NULL, CHAN_HELP_KICK, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 /**
  * Add the help response to anopes /cs help output.
@@ -151,4 +138,4 @@ int do_cs_kick(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_kick")
+MODULE_INIT(CSKick)
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index b7b477744..778c96c16 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -18,38 +18,24 @@
 int do_list(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSList : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSList(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("LIST", do_list, NULL, -1, CHAN_HELP_LIST,
-                      CHAN_SERVADMIN_HELP_LIST,
-                      CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("LIST", do_list, NULL, -1, CHAN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -198,4 +184,4 @@ int do_list(User * u)
 
 }
 
-MODULE_INIT("cs_list")
+MODULE_INIT(CSList)
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index d8fb911ed..c752c8945 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -19,38 +19,23 @@ int do_logout(User * u);
 void myChanServHelp(User * u);
 void make_unidentified(User * u, ChannelInfo * ci);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSLogout : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
-
-    c = createCommand("LOGOUT", do_logout, NULL, -1, CHAN_HELP_LOGOUT, -1,
-                      CHAN_SERVADMIN_HELP_LOGOUT,
-                      CHAN_SERVADMIN_HELP_LOGOUT);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+ public:
+	CSLogout(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-}
+		c = createCommand("LOGOUT", do_logout, NULL, -1, CHAN_HELP_LOGOUT, -1, CHAN_SERVADMIN_HELP_LOGOUT, CHAN_SERVADMIN_HELP_LOGOUT);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 /**
@@ -130,4 +115,4 @@ void make_unidentified(User * u, ChannelInfo * ci)
     }
 }
 
-MODULE_INIT("cs_logout")
+MODULE_INIT(CSLogout)
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index feb82d108..83cc4cd58 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -28,76 +28,57 @@ int do_deprotect(User * u);
 int do_owner(User * u);
 int do_deowner(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSModes : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
-
-    c = createCommand("OP", do_op, NULL, CHAN_HELP_OP, -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("DEOP", do_deop, NULL, CHAN_HELP_DEOP, -1, -1, -1,
-                      -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("VOICE", do_voice, NULL, CHAN_HELP_VOICE, -1, -1, -1,
-                      -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("DEVOICE", do_devoice, NULL, CHAN_HELP_DEVOICE, -1,
-                      -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    if (ircd->halfop) {
-        c = createCommand("HALFOP", do_halfop, NULL, CHAN_HELP_HALFOP, -1,
-                          -1, -1, -1);
-        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-        c = createCommand("DEHALFOP", do_dehalfop, NULL,
-                          CHAN_HELP_DEHALFOP, -1, -1, -1, -1);
-        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    }
-    if (ircd->protect) {
-        c = createCommand("PROTECT", do_protect, NULL, CHAN_HELP_PROTECT,
-                          -1, -1, -1, -1);
-        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-        c = createCommand("DEPROTECT", do_deprotect, NULL,
-                          CHAN_HELP_DEPROTECT, -1, -1, -1, -1);
-        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    }
-    if (ircd->owner) {
-        c = createCommand("OWNER", do_owner, NULL, CHAN_HELP_OWNER, -1, -1,
-                          -1, -1);
-        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-        c = createCommand("DEOWNER", do_deowner, NULL, CHAN_HELP_DEOWNER,
-                          -1, -1, -1, -1);
-        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    }
-    if (ircd->admin) {
-        c = createCommand("ADMIN", do_protect, NULL, CHAN_HELP_PROTECT, -1,
-                          -1, -1, -1);
-        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-        c = createCommand("DEADMIN", do_deprotect, NULL,
-                          CHAN_HELP_DEPROTECT, -1, -1, -1, -1);
-        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    }
-
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
-
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+ public:
+	CSModes(const std::string &creator) : Module(creator)
+	{
+		Command *c;
+
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
+
+		c = createCommand("OP", do_op, NULL, CHAN_HELP_OP, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("DEOP", do_deop, NULL, CHAN_HELP_DEOP, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("VOICE", do_voice, NULL, CHAN_HELP_VOICE, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("DEVOICE", do_devoice, NULL, CHAN_HELP_DEVOICE, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		if (ircd->halfop)
+		{
+			c = createCommand("HALFOP", do_halfop, NULL, CHAN_HELP_HALFOP, -1, -1, -1, -1);
+			moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+			c = createCommand("DEHALFOP", do_dehalfop, NULL, CHAN_HELP_DEHALFOP, -1, -1, -1, -1);
+			moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		}
+		if (ircd->protect)
+		{
+			c = createCommand("PROTECT", do_protect, NULL, CHAN_HELP_PROTECT, -1, -1, -1, -1);
+			moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+			c = createCommand("DEPROTECT", do_deprotect, NULL, CHAN_HELP_DEPROTECT, -1, -1, -1, -1);
+			moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		}
+		if (ircd->owner)
+		{
+			c = createCommand("OWNER", do_owner, NULL, CHAN_HELP_OWNER, -1, -1, -1, -1);
+			moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+			c = createCommand("DEOWNER", do_deowner, NULL, CHAN_HELP_DEOWNER, -1, -1, -1, -1);
+			moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		}
+		if (ircd->admin)
+		{
+			c = createCommand("ADMIN", do_protect, NULL, CHAN_HELP_PROTECT, -1, -1, -1, -1);
+			moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+			c = createCommand("DEADMIN", do_deprotect, NULL, CHAN_HELP_DEPROTECT, -1, -1, -1, -1);
+			moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		}
+
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 /**
  * Add the help response to anopes /cs help output.
@@ -387,4 +368,4 @@ int do_util(User * u, CSModeUtil * util)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_modes")
+MODULE_INIT(CSModes)
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 713500e99..a7cb6b3ab 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -18,37 +18,24 @@
 int do_register(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the off command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSRegister : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSRegister(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("REGISTER", do_register, NULL, CHAN_HELP_REGISTER,
-                      -1, -1, -1, -1);
-    c->help_param1 = s_NickServ;
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("REGISTER", do_register, NULL, CHAN_HELP_REGISTER, -1, -1, -1, -1);
+		c->help_param1 = s_NickServ;
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -189,4 +176,4 @@ int do_register(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_register")
+MODULE_INIT(CSRegister)
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index ac858f1a6..898dded3f 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -18,40 +18,30 @@
 int do_sendpass(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSSendPass : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSSendPass(const std::string &creator) : Module(creator)
+	{
 
-    c = createCommand("SENDPASS", do_sendpass, NULL, CHAN_HELP_SENDPASS,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		Command *c;
 
-    moduleSetChanHelp(myChanServHelp);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    if (UseMail) {
-        return MOD_CONT;
-    } else {
-        return MOD_STOP;
-    }
-}
+		c = createCommand("SENDPASS", do_sendpass, NULL, CHAN_HELP_SENDPASS,
+		-1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleSetChanHelp(myChanServHelp);
 
-}
+		if (!UseMail)
+		{
+			throw ModuleException("sendpass may not be loaded if UseMail is loaded");
+		}
+	}
+};
 
 
 
@@ -124,4 +114,4 @@ int do_sendpass(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_sendpass")
+MODULE_INIT(CSSendPass)
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 646e4313b..2f2a999d0 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -40,102 +40,68 @@ int do_set_peace(User * u, ChannelInfo * ci, char *param);
 int do_set_noexpire(User * u, ChannelInfo * ci, char *param);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
-{
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
-
-    c = createCommand("SET", do_set, NULL, CHAN_HELP_SET, -1, -1,
-                      CHAN_SERVADMIN_HELP_SET, CHAN_SERVADMIN_HELP_SET);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET FOUNDER", NULL, NULL, CHAN_HELP_SET_FOUNDER, -1,
-                      -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET SUCCESSOR", NULL, NULL, CHAN_HELP_SET_SUCCESSOR,
-                      -1, -1, -1, -1);
-    c->help_param1 = (char *) (long) CSMaxReg;
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET PASSWORD", NULL, NULL, CHAN_HELP_SET_PASSWORD,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET DESC", NULL, NULL, CHAN_HELP_SET_DESC, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET URL", NULL, NULL, CHAN_HELP_SET_URL, -1, -1, -1,
-                      -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET EMAIL", NULL, NULL, CHAN_HELP_SET_EMAIL, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET ENTRYMSG", NULL, NULL, CHAN_HELP_SET_ENTRYMSG,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET BANTYPE", NULL, NULL, CHAN_HELP_SET_BANTYPE, -1,
-                      -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET PRIVATE", NULL, NULL, CHAN_HELP_SET_PRIVATE, -1,
-                      -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET KEEPTOPIC", NULL, NULL, CHAN_HELP_SET_KEEPTOPIC,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET TOPICLOCK", NULL, NULL, CHAN_HELP_SET_TOPICLOCK,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET MLOCK", NULL, NULL, CHAN_HELP_SET_MLOCK, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET RESTRICTED", NULL, NULL,
-                      CHAN_HELP_SET_RESTRICTED, -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET SECURE", NULL, NULL, CHAN_HELP_SET_SECURE, -1,
-                      -1, -1, -1);
-    c->help_param1 = s_NickServ;
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET SECUREOPS", NULL, NULL, CHAN_HELP_SET_SECUREOPS,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET SECUREFOUNDER", NULL, NULL,
-                      CHAN_HELP_SET_SECUREFOUNDER, -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET SIGNKICK", NULL, NULL, CHAN_HELP_SET_SIGNKICK,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET OPNOTICE", NULL, NULL, CHAN_HELP_SET_OPNOTICE,
-                      -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET XOP", NULL, NULL, CHAN_HELP_SET_XOP, -1, -1, -1,
-                      -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET PEACE", NULL, NULL, CHAN_HELP_SET_PEACE, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("SET NOEXPIRE", NULL, NULL, -1, -1, -1,
-                      CHAN_SERVADMIN_HELP_SET_NOEXPIRE,
-                      CHAN_SERVADMIN_HELP_SET_NOEXPIRE);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
-
-/**
- * Unload the module
- **/
-void AnopeFini(void)
+class CSSet : public Module
 {
+ public:
+	CSSet(const std::string &creator) : Module(creator)
+	{
+		Command *c;
+
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
+
+		c = createCommand("SET", do_set, NULL, CHAN_HELP_SET, -1, -1, CHAN_SERVADMIN_HELP_SET, CHAN_SERVADMIN_HELP_SET);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET FOUNDER", NULL, NULL, CHAN_HELP_SET_FOUNDER, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET SUCCESSOR", NULL, NULL, CHAN_HELP_SET_SUCCESSOR, -1, -1, -1, -1);
+		c->help_param1 = (char *) (long) CSMaxReg;
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET PASSWORD", NULL, NULL, CHAN_HELP_SET_PASSWORD, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET DESC", NULL, NULL, CHAN_HELP_SET_DESC, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET URL", NULL, NULL, CHAN_HELP_SET_URL, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET EMAIL", NULL, NULL, CHAN_HELP_SET_EMAIL, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET ENTRYMSG", NULL, NULL, CHAN_HELP_SET_ENTRYMSG, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET BANTYPE", NULL, NULL, CHAN_HELP_SET_BANTYPE, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET PRIVATE", NULL, NULL, CHAN_HELP_SET_PRIVATE, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET KEEPTOPIC", NULL, NULL, CHAN_HELP_SET_KEEPTOPIC, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET TOPICLOCK", NULL, NULL, CHAN_HELP_SET_TOPICLOCK, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET MLOCK", NULL, NULL, CHAN_HELP_SET_MLOCK, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET RESTRICTED", NULL, NULL, CHAN_HELP_SET_RESTRICTED, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET SECURE", NULL, NULL, CHAN_HELP_SET_SECURE, -1, -1, -1, -1);
+		c->help_param1 = s_NickServ;
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET SECUREOPS", NULL, NULL, CHAN_HELP_SET_SECUREOPS, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET SECUREFOUNDER", NULL, NULL, CHAN_HELP_SET_SECUREFOUNDER, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET SIGNKICK", NULL, NULL, CHAN_HELP_SET_SIGNKICK, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET OPNOTICE", NULL, NULL, CHAN_HELP_SET_OPNOTICE, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET XOP", NULL, NULL, CHAN_HELP_SET_XOP, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET PEACE", NULL, NULL, CHAN_HELP_SET_PEACE, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("SET NOEXPIRE", NULL, NULL, -1, -1, -1, CHAN_SERVADMIN_HELP_SET_NOEXPIRE, CHAN_SERVADMIN_HELP_SET_NOEXPIRE);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
-}
 
 /**
  * Add the help response to anopes /cs help output.
@@ -835,4 +801,4 @@ int do_set_noexpire(User * u, ChannelInfo * ci, char *param)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_set")
+MODULE_INIT(CSSet)
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index 8da8efce0..6d49d92bf 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -18,37 +18,23 @@
 int do_status(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSStatus : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSStatus(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("STATUS", do_status, is_services_admin, -1, -1, -1,
-                      CHAN_SERVADMIN_HELP_STATUS,
-                      CHAN_SERVADMIN_HELP_STATUS);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("STATUS", do_status, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_STATUS, CHAN_SERVADMIN_HELP_STATUS);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -101,4 +87,4 @@ int do_status(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_status")
+MODULE_INIT(CSStatus)
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 3adc3611a..12f93ffb0 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -19,41 +19,26 @@ int do_suspend(User * u);
 int do_unsuspend(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSSuspend : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSSuspend(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1,
-                      CHAN_SERVADMIN_HELP_SUSPEND,
-                      CHAN_SERVADMIN_HELP_SUSPEND);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1,
-                      -1, CHAN_SERVADMIN_HELP_UNSUSPEND,
-                      CHAN_SERVADMIN_HELP_UNSUSPEND);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, CHAN_SERVADMIN_HELP_SUSPEND, CHAN_SERVADMIN_HELP_SUSPEND);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1, -1, CHAN_SERVADMIN_HELP_UNSUSPEND, CHAN_SERVADMIN_HELP_UNSUSPEND);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
-}
 
 /**
  * Add the help response to anopes /cs help output.
@@ -210,4 +195,4 @@ int do_unsuspend(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_suspend")
+MODULE_INIT(CSSuspend)
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index b6bc95dde..2dc3b46c1 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -18,36 +18,24 @@
 int do_cs_topic(User * u);
 void myChanServHelp(User * u);
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSTopic : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
+ public:
+	CSTopic(const std::string &creator) : Module(creator)
+	{
+		Command *c;
 
-    c = createCommand("TOPIC", do_cs_topic, NULL, CHAN_HELP_TOPIC, -1, -1,
-                      -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
 
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
+		c = createCommand("TOPIC", do_cs_topic, NULL, CHAN_HELP_TOPIC, -1, -1,-1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
 
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
-}
 
 /**
  * Add the help response to anopes /cs help output.
@@ -118,4 +106,4 @@ int do_cs_topic(User * u)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_topic")
+MODULE_INIT(CSTopic)
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index e4589d24e..cc177549c 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -82,44 +82,32 @@ int xop_msgs[4][14] = {
      CHAN_HOP_CLEAR}
 };
 
-/**
- * Create the command, and tell anope about it.
- * @param argc Argument count
- * @param argv Argument list
- * @return MOD_CONT to allow the module, MOD_STOP to stop it
- **/
-int AnopeInit(int argc, char **argv)
+class CSXOP : public Module
 {
-    Command *c;
-
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
-    moduleSetType(CORE);
-
-    c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    if (ircd->halfop) {
-        c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1,
-                          -1);
-        moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    }
-    c = createCommand("SOP", do_sop, NULL, CHAN_HELP_SOP, -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-    c = createCommand("VOP", do_vop, NULL, CHAN_HELP_VOP, -1, -1, -1, -1);
-    moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
-
-    moduleSetChanHelp(myChanServHelp);
-
-    return MOD_CONT;
-}
-
-/**
- * Unload the module
- **/
-void AnopeFini(void)
-{
-
-}
+ public:
+	CSXOP(const std::string &creator) : Module(creator)
+	{
+		Command *c;
+
+		moduleAddAuthor("Anope");
+		moduleAddVersion("$Id$");
+		moduleSetType(CORE);
+
+		c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		if (ircd->halfop)
+		{
+			c = createCommand("HOP", do_hop, NULL, CHAN_HELP_HOP, -1, -1, -1, -1);
+			moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		}
+		c = createCommand("SOP", do_sop, NULL, CHAN_HELP_SOP, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+		c = createCommand("VOP", do_vop, NULL, CHAN_HELP_VOP, -1, -1, -1, -1);
+		moduleAddCommand(CHANSERV, c, MOD_UNIQUE);
+
+		moduleSetChanHelp(myChanServHelp);
+	}
+};
 
 
 
@@ -508,4 +496,4 @@ int do_xop(User * u, const char *xname, int xlev, int *xmsgs)
     return MOD_CONT;
 }
 
-MODULE_INIT("cs_xop")
+MODULE_INIT(CSXOP)