New source tree structure for modules. From commands/cs_access => chanserv/access etc.

18 files changed, 322 insertions, 839 deletions

diff --git a/data/bahamut.example.conf b/data/bahamut.example.conf
index e43e2409f..894d03411 100644
--- a/data/bahamut.example.conf
+++ b/data/bahamut.example.conf
@@ -1,7 +1,7 @@
 
 module
 {
-	name = "bahamut"
+	name = "protocol/bahamut"
 }
 
 usermode
diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index 83154e0c4..817188bc8 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -76,7 +76,7 @@ service
  */
 module
 {
-	name = "botserv"
+	name = "botserv/main"
 
 	/*
 	 * The name of the client that should be BotServ.
@@ -148,7 +148,7 @@ module
 command { service = "BotServ"; name = "HELP"; command = "generic/help"; }
 
 /*
- * bs_assign
+ * botserv/gassign
  *
  * Provides the commands:
  *   botserv/assign - Used to assign BotServ bots to channels
@@ -157,19 +157,19 @@ command { service = "BotServ"; name = "HELP"; command = "generic/help"; }
  *
  * Used for assigning and unassigning bots to channels.
  */
-module { name = "bs_assign" }
+module { name = "botserv/assign" }
 command { service = "BotServ"; name = "ASSIGN"; command = "botserv/assign"; }
 command { service = "BotServ"; name = "UNASSIGN"; command = "botserv/unassign"; }
 command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"; permission = "botserv/set/nobot"; }
 
 /*
- * bs_autoassign
+ * botserv/gautoassign
  *
  * Allows service bots to be automatically assigned to channels upon registration.
  */
 #module
 {
-	name = "bs_autoassign"
+	name = "botserv/autoassign"
 
 	/*
 	 * Automatically assign ChanServ to channels upon registration.
@@ -178,7 +178,7 @@ command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"
 }
 
 /*
- * bs_badwords
+ * botserv/gbadwords
  *
  * Provides the command botserv/badwords.
  *
@@ -186,7 +186,7 @@ command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"
  */
 module
 {
-	name = "bs_badwords"
+	name = "botserv/badwords"
 
 	/*
 	 * The maximum number of entries a single bad words list can have.
@@ -203,48 +203,48 @@ module
 command { service = "BotServ"; name = "BADWORDS"; command = "botserv/badwords"; }
 
 /*
- * bs_bot
+ * botserv/gbot
  *
  * Provides the command botserv/bot.
  *
  * Used for administrating BotServ bots.
  */
-module { name = "bs_bot" }
+module { name = "botserv/gbot" }
 command { service = "BotServ"; name = "BOT"; command = "botserv/bot"; permission = "botserv/bot"; }
 
 /*
- * bs_botlist
+ * botserv/gbotlist
  *
  * Provides the command botserv/botlist.
  *
  * Used for listing all available bots.
  */
-module { name = "bs_botlist" }
+module { name = "botserv/gbotlist" }
 command { service = "BotServ"; name = "BOTLIST"; command = "botserv/botlist"; }
 
 /*
- * bs_control
+ * botserv/gcontrol
  *
  * Provides the commands botserv/act and botserv/say.
  *
  * Used for making the bot message a channel.
  */
-module { name = "bs_control" }
+module { name = "botserv/gcontrol" }
 command { service = "BotServ"; name = "ACT"; command = "botserv/act"; }
 command { service = "BotServ"; name = "SAY"; command = "botserv/say"; }
 
 /*
- * bs_info
+ * botserv/ginfo
  *
  * Provides the command botserv/info.
  *
  * Used for getting information on bots or channels.
  */
-module { name = "bs_info" }
+module { name = "botserv/ginfo" }
 command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
 
 /*
- * bs_kick
+ * botserv/gkick
  *
  * Provides the commands:
  *   botserv/kick - Dummy help wrapper for the KICK command.
@@ -265,7 +265,7 @@ command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
  */
 module
 {
-	name = "bs_kick"
+	name = "botserv/gkick"
 
 	/*
 	 * The amount of time that data for a user is valid in BotServ. If the data exceeds this time,
@@ -299,12 +299,12 @@ command { service = "BotServ"; name = "SET DONTKICKVOICES"; command = "botserv/s
 
 
 /*
- * bs_set
+ * botserv/gset
  *
  * Provides the commands:
  *   botserv/set/private - Used to prohibit specific BotServ bots from being assigned to channels.
  */
-module { name = "bs_set" }
+module { name = "botserv/gset" }
 command { service = "BotServ"; name = "SET"; command = "botserv/set"; }
 command { service = "BotServ"; name = "SET BANEXPIRE"; command = "botserv/set/banexpire"; }
 command { service = "BotServ"; name = "SET PRIVATE"; command = "botserv/set/private"; permission = "botserv/set/private"; }
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 86ca969fc..a12071f3a 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -49,7 +49,7 @@ service
  */
 module
 {
-	name = "chanserv"
+	name = "chanserv/main"
 
 	/*
 	 * The name of the client that should be ChanServ.
@@ -65,9 +65,9 @@ module
 	 * -      keeptopic: Retain topic when the channel is not in use
 	 * -          peace: Disallow users from kicking or removing modes from others who are of the same
 	 *                     access level or superior
-	 * -     cs_private: Hide the channel from ChanServ's LIST command
+	 * -     chanserv/private: Hide the channel from ChanServ's LIST command
 	 * -     restricted: Kick/ban users who are restricted from the channel
-	 * -      cs_secure: Enable channel security, requiring the user to be identified with NickServ in
+	 * -      chanserv/secure: Enable channel security, requiring the user to be identified with NickServ in
 	 *                     order to be considered for being on the access list of the channel
 	 * -      secureops: Only allow operator status to be given if the user is on the access list
 	 * -  securefounder: Only allow the real founder of the channel to drop the channel, change it's
@@ -78,14 +78,14 @@ module
 	 * -      topiclock: Disallow the topic to be changed except with ChanServ's TOPIC command
 	 * -        persist: Keep the channel open at all times
 	 * -       noautoop: Disables autoop on the channel
-	 * -  cs_keep_modes: Enables keep modes on the channel, which retains modes when the channel is
+	 * -  chanserv/keep_modes: Enables keep modes on the channel, which retains modes when the channel is
 	 *                     not in use.
 	 * -           none: No defaults
 	 *
-	 * This directive is optional, if left blank, the options will default to keeptopic, cs_secure, securefounder,
+	 * This directive is optional, if left blank, the options will default to keeptopic, chanserv/secure, securefounder,
 	 * and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "keeptopic peace cs_secure securefounder signkick"
+	defaults = "keeptopic peace chanserv/secure securefounder signkick"
 
 	/*
 	 * The maximum number of channels which may be registered to a single nickname.
@@ -175,14 +175,14 @@ module
  * determine how powerful privileges are relative to other privileges, which is used by Anope to determine
  * who has greater access in a channel.
  *
- * If you load cs_access, you may define a level for the privilege, which is used by chanserv/access and chanserv/levels.
+ * If you load chanserv/access, you may define a level for the privilege, which is used by chanserv/access and chanserv/levels.
  * The levels defined will be used as the default levels for newly registered channels.
  * The level "founder" is a special level which means anyone with the privilege FOUNDER on the channel
  * has that permission. Additionally, the level "disabled" means that no one can use the privilege, including founders.
  *
- * If you load cs_flags, you may define a flag associated with that privilege for use in chanserv/flags.
+ * If you load chanserv/flags, you may define a flag associated with that privilege for use in chanserv/flags.
  *
- * If you load cs_xop, you may define a XOP command to associate the privilege with.
+ * If you load chanserv/xop, you may define a XOP command to associate the privilege with.
  *
  * The name of privileges are uesd to associate them with channel modes. If you are using an IRCd that allows you to define additional
  * channel status modes, such as InspIRCd, you can associate privileges (and thus access levels, flags, xop) with the mode by naming
@@ -822,7 +822,7 @@ command_group
 command { service = "ChanServ"; name = "HELP"; command = "generic/help"; }
 
 /*
- * cs_access
+ * chanserv/access
  *
  * Provides commands chanserv/access and chanserv/levels.
  * Provides the access system "levels".
@@ -831,15 +831,15 @@ command { service = "ChanServ"; name = "HELP"; command = "generic/help"; }
  * are representated by given level on a per channel basis.
  *
  * The "LIST" subcommand of chanserv/access will show every access entry on the channel, including access
- * entries not added by cs_access. The "level" of these entries will be the representation of the access
+ * entries not added by chanserv/access. The "level" of these entries will be the representation of the access
  * entry by the other access system, which could be an XOP command name, or a set of flags.
  */
-module { name = "cs_access" }
+module { name = "chanserv/access" }
 command { service = "ChanServ"; name = "ACCESS"; command = "chanserv/access"; group = "chanserv/access"; }
 command { service = "ChanServ"; name = "LEVELS"; command = "chanserv/levels"; group = "chanserv/access"; }
 
 /*
- * cs_akick
+ * chanserv/akick
  *
  * Provides the command chanserv/akick.
  *
@@ -847,7 +847,7 @@ command { service = "ChanServ"; name = "LEVELS"; command = "chanserv/levels"; gr
  */
 module
 {
-	name = "cs_akick"
+	name = "chanserv/akick"
 
 	/*
 	 * The maximum number of entries on a channel's autokick list.
@@ -862,7 +862,7 @@ module
 command { service = "ChanServ"; name = "AKICK"; command = "chanserv/akick"; group = "chanserv/management"; }
 
 /*
- * cs_ban
+ * chanserv/ban
  *
  * Provides the command chanserv/ban.
  *
@@ -874,41 +874,41 @@ command { service = "ChanServ"; name = "AKICK"; command = "chanserv/akick"; grou
  *
  * Used for banning users from channels.
  */
-module { name = "cs_ban" }
+module { name = "chanserv/ban" }
 command { service = "ChanServ"; name = "BAN"; command = "chanserv/ban"; }
 
 /*
- * cs_clone
+ * chanserv/clone
  *
  * Provides the command chanserv/clone.
  *
  * Used for copying channel settings from one channel to another.
  */
-module { name = "cs_clone" }
+module { name = "chanserv/clone" }
 command { service = "ChanServ"; name = "CLONE"; command = "chanserv/clone"; group = "chanserv/management"; }
 
 /*
- * cs_drop
+ * chanserv/drop
  *
  * Provides the command chanserv/drop.
  *
  * Used for unregistering channels.
  */
-module { name = "cs_drop" }
+module { name = "chanserv/drop" }
 command { service = "ChanServ"; name = "DROP"; command = "chanserv/drop"; }
 
 /*
- * cs_enforce
+ * chanserv/enforce
  *
  * Provides the command chanserv/enforce.
  *
  * Used to enforce various channel settings such as secureops and restricted.
  */
-module { name = "cs_enforce" }
+module { name = "chanserv/enforce" }
 command { service = "ChanServ"; name = "ENFORCE"; command = "chanserv/enforce"; group = "chanserv/management"; }
 
 /*
- * cs_entrymsg
+ * chanserv/entrymsg
  *
  * Provides the command chanserv/entrymsg.
  *
@@ -916,7 +916,7 @@ command { service = "ChanServ"; name = "ENFORCE"; command = "chanserv/enforce";
  */
 module
 {
-	name = "cs_entrymsg"
+	name = "chanserv/entrymsg"
 
 	/* The maximum number of entrymsgs allowed per channel. If not set, defaults to 5. */
 	maxentries = 5
@@ -924,7 +924,7 @@ module
 command { service = "ChanServ"; name = "ENTRYMSG"; command = "chanserv/entrymsg"; group = "chanserv/management"; }
 
 /*
- * cs_flags
+ * chanserv/flags
  *
  * Provides the command chanserv/flags.
  * Provides the access system "flags".
@@ -932,54 +932,54 @@ command { service = "ChanServ"; name = "ENTRYMSG"; command = "chanserv/entrymsg"
  * Used for giving users access in channels.
  *
  * The "LIST" subcommand of chanserv/flags will show every access entry on the channel, including access
- * entries not added by cs_flags. The "Flags" of these entries will be the flags representation of the
+ * entries not added by chanserv/flags. The "Flags" of these entries will be the flags representation of the
  * privilege set granted by the access entry.
  */
-module { name = "cs_flags" }
+module { name = "chanserv/flags" }
 command { service = "ChanServ"; name = "FLAGS"; command = "chanserv/flags"; group = "chanserv/access"; }
 
 /*
- * cs_getkey
+ * chanserv/getkey
  *
  * Provides the command chanserv/getkey.
  *
  * Used for getting the key for channels.
  */
-module { name = "cs_getkey" }
+module { name = "chanserv/getkey" }
 command { service = "ChanServ"; name = "GETKEY"; command = "chanserv/getkey"; }
 
 /*
- * cs_info
+ * chanserv/info
  *
  * Provides the command chanserv/info.
  *
  * Used for getting information about channels.
  */
-module { name = "cs_info" }
+module { name = "chanserv/info" }
 command { service = "ChanServ"; name = "INFO"; command = "chanserv/info"; }
 
 /*
- * cs_invite
+ * chanserv/invite
  *
  * Provides the command chanserv/invite.
  *
  * Used for inviting yourself in to channels.
  */
-module { name = "cs_invite" }
+module { name = "chanserv/invite" }
 command { service = "ChanServ"; name = "INVITE"; command = "chanserv/invite"; }
 
 /*
- * cs_kick
+ * chanserv/kick
  *
  * Provides the command chanserv/kick.
  *
  * Used for kicking users from channels.
  */
-module { name = "cs_kick" }
+module { name = "chanserv/kick" }
 command { service = "ChanServ"; name = "KICK"; command = "chanserv/kick"; }
 
 /*
- * cs_list
+ * chanserv/list
  *
  * Provides the commands:
  *   chanserv/list - Used for retrieving and searching the registered channel list.
@@ -987,7 +987,7 @@ command { service = "ChanServ"; name = "KICK"; command = "chanserv/kick"; }
  */
 module
 {
-	name = "cs_list"
+	name = "chanserv/list"
 
 	/*
 	 * The maximum number of channels to be returned for a ChanServ LIST command.
@@ -1000,7 +1000,7 @@ command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/pr
 
 
 /*
- * cs_log
+ * chanserv/log
  *
  * Provides the command chanserv/log.
  *
@@ -1008,7 +1008,7 @@ command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/pr
  */
 module
 {
-	name = "cs_log"
+	name = "chanserv/log"
 
 	/* Default log settings for newly registered channels */
 
@@ -1041,7 +1041,7 @@ module
 command { service = "ChanServ"; name = "LOG"; command = "chanserv/log"; group = "chanserv/management"; }
 
 /*
- * cs_mode
+ * chanserv/mode
  *
  * Provides the command chanserv/mode and chanserv/modes.
  *
@@ -1051,7 +1051,7 @@ command { service = "ChanServ"; name = "LOG"; command = "chanserv/log"; group =
  */
 module
 {
-	name = "cs_mode"
+	name = "chanserv/mode"
 
 	/*
 	 * Default modes for mode lock, these are set on newly registered channels.
@@ -1086,17 +1086,17 @@ command { service = "ChanServ"; name = "DEVOICE"; command = "chanserv/modes"; gr
 
 
 /*
- * cs_register
+ * chanserv/register
  *
  * Provides the commands chanserv/register.
  *
  * Used for registering channels.
  */
-module { name = "cs_register" }
+module { name = "chanserv/register" }
 command { service = "ChanServ"; name = "REGISTER"; command = "chanserv/register"; }
 
 /*
- * cs_seen
+ * chanserv/seen
  *
  * Provides the commands chanserv/seen and operserv/seen.
  *
@@ -1105,7 +1105,7 @@ command { service = "ChanServ"; name = "REGISTER"; command = "chanserv/register"
  */
 module
 {
-	name = "cs_seen"
+	name = "chanserv/seen"
 
 	/* If set, uses the older 1.8 style seen, which is less resource intensive */
 	simple = false
@@ -1119,7 +1119,7 @@ module
 command { service = "OperServ"; name = "SEEN"; command = "operserv/seen"; permission = "operserv/seen"; }
 
 /*
- * cs_set
+ * chanserv/set
  *
  * Provides the commands:
  *   chanserv/set and chanserv/saset - Dummy help wrappers for the SET commands.
@@ -1142,7 +1142,7 @@ command { service = "OperServ"; name = "SEEN"; command = "operserv/seen"; permis
  */
 module
 {
-	name = "cs_set"
+	name = "chanserv/set"
 
 	/*
 	 * The default ban type for newly registered channels.
@@ -1180,30 +1180,30 @@ command { service = "ChanServ"; name = "SET SUCCESSOR"; command = "chanserv/set/
 command { service = "ChanServ"; name = "SET NOEXPIRE"; command = "chanserv/saset/noexpire"; permission = "chanserv/saset/noexpire"; }
 
 /*
- * cs_set_misc
+ * chanserv/set_misc
  *
  * Provides the command chanserv/set/misc.
  *
  * Allows you to create arbitrary commands to set data, and have that data show up in chanserv/info.
  * A field named misc_description may be given for use with help output.
  */
-module { name = "cs_set_misc" }
+module { name = "chanserv/set_misc" }
 command { service = "ChanServ"; name = "SET URL"; command = "chanserv/set/misc"; misc_description = _("Associate a URL with the channel"); }
 command { service = "ChanServ"; name = "SET EMAIL"; command = "chanserv/set/misc"; misc_description = _("Associate an E-mail address with the channel"); }
 
 /*
- * cs_status
+ * chanserv/status
  *
  * Provides the command chanserv/status.
  *
  * Used for determining a user's access on a channel and whether
  * or not they match any autokick entries.
  */
-module { name = "cs_status" }
+module { name = "chanserv/status" }
 command { service = "ChanServ"; name = "STATUS"; command = "chanserv/status"; }
 
 /*
- * cs_suspend
+ * chanserv/suspend
  *
  * Provides the commands chanserv/suspend and chanserv/unsuspend.
  *
@@ -1211,7 +1211,7 @@ command { service = "ChanServ"; name = "STATUS"; command = "chanserv/status"; }
  */
 module
 {
-	name = "cs_suspend"
+	name = "chanserv/suspend"
 
 	/*
 	 * The length of time before a suspended channel expires.
@@ -1232,50 +1232,50 @@ command { service = "ChanServ"; name = "SUSPEND"; command = "chanserv/suspend";
 command { service = "ChanServ"; name = "UNSUSPEND"; command = "chanserv/unsuspend"; permission = "chanserv/suspend"; group = "chanserv/admin"; }
 
 /*
- * cs_sync
+ * chanserv/sync
  *
  * Provides the command chanserv/sync.
  *
  * Used to sync users channel status modes with what access they have.
  */
-module { name = "cs_sync" }
+module { name = "chanserv/sync" }
 command { service = "ChanServ"; name = "SYNC"; command = "chanserv/sync"; group = "chanserv/management"; }
 
 /*
- * cs_topic
+ * chanserv/topic
  *
  * Provides the commands:
  *   chanserv/topic - Used for changing the channel topic. Useful in conjunction with chanserv/set/topiclock.
  *   chanserv/set/keeptopic - Used for configuring if ChanServ is to restore the channel topic when a channel is created.
  *
  */
-module { name = "cs_topic" }
+module { name = "chanserv/topic" }
 command { service = "ChanServ"; name = "TOPIC"; command = "chanserv/topic"; group = "chanserv/management"; }
 command { service = "ChanServ"; name = "SET KEEPTOPIC"; command = "chanserv/set/keeptopic"; }
 
 /*
- * cs_unban
+ * chanserv/unban
  *
  * Provides the command chanserv/unban.
  *
  * Used for unbanning users from channels.
  */
-module { name = "cs_unban" }
+module { name = "chanserv/unban" }
 command { service = "ChanServ"; name = "UNBAN"; command = "chanserv/unban"; }
 
 /*
- * cs_updown
+ * chanserv/updown
  *
  * Provides the commands chanserv/up and chanserv/down.
  *
  * Used for setting or removing your status modes on a channel.
  */
-module { name = "cs_updown" }
+module { name = "chanserv/updown" }
 command { service = "ChanServ"; name = "DOWN"; command = "chanserv/down"; group = "chanserv/status"; }
 command { service = "ChanServ"; name = "UP"; command = "chanserv/up"; group = "chanserv/status"; }
 
 /*
- * cs_xop
+ * chanserv/xop
  *
  * Provides the command chanserv/xop.
  * Provides the access system "XOP".
@@ -1288,7 +1288,7 @@ command { service = "ChanServ"; name = "UP"; command = "chanserv/up"; group = "c
  * The "LIST" subcommand of chanserv/xop will show only XOP access entries of the given XOP type. You
  * can not view the entire access list at once, and instead should use another access system to do that.
  */
-module { name = "cs_xop" }
+module { name = "chanserv/xop" }
 command { service = "ChanServ"; name = "QOP"; command = "chanserv/xop"; group = "chanserv/access"; }
 command { service = "ChanServ"; name = "SOP"; command = "chanserv/xop"; group = "chanserv/access"; }
 command { service = "ChanServ"; name = "AOP"; command = "chanserv/xop"; group = "chanserv/access"; }
@@ -1301,9 +1301,9 @@ command { service = "ChanServ"; name = "VOP"; command = "chanserv/xop"; group =
  */
 
 /*
- * cs_statusupdate
+ * chanserv/statusupdate
  *
  * This module automatically updates users status on channels when the
  * channel's access list is modified.
  */
-module { name = "cs_statusupdate" }
+module { name = "chanserv/statusupdate" }
diff --git a/data/chanstats.example.conf b/data/chanstats.example.conf
index 64f57da30..df19374a2 100644
--- a/data/chanstats.example.conf
+++ b/data/chanstats.example.conf
@@ -5,7 +5,7 @@
 
 module
 {
-	name = "m_chanstats"
+	name = "chanstats"
 
 	/*
 	 * The name of this engine.
diff --git a/data/example.conf b/data/example.conf
index 02f7f9016..6843c8021 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1046,7 +1046,7 @@ mail
  */
 #module
 {
-	name = "db_old"
+	name = "database/old"
 
 	/*
 	 * This is the encryption type used by the databases. This must be set correctly or
@@ -1064,7 +1064,7 @@ mail
  */
 module
 {
-	name = "db_flatfile"
+	name = "database/flatfile"
 
 	/*
 	 * The database name db_flatfile should use
@@ -1105,10 +1105,10 @@ module
  */
 #module
 {
-	name = "db_sql"
+	name = "database/sql"
 
 	/*
-	 * The SQL service db_sql should use, these are configured in modules.conf.
+	 * The SQL service database/sql should use, these are configured in modules.conf.
 	 * For MySQL, this should probably be mysql/main.
 	 */
 	engine = "sqlite/main"
@@ -1123,14 +1123,14 @@ module
  * db_redis.
  *
  * This module allows using Redis (http://redis.io) as a database backend.
- * This module requires that m_redis is loaded and configured properly.
+ * This module requires the module redis to be loaded and configured properly.
  */
 #module
 {
-	name = "db_redis"
+	name = "database/redis"
 
 	/*
-	 * Redis database to use. This must be configured with m_redis.
+	 * Redis database to use. This must be configured with the module redis.
 	 */
 	engine = "redis/main"
 }
@@ -1144,9 +1144,9 @@ module
  *
  * Without any encryption modules loaded users will not be able to authenticate unless
  * there is another module loaded that provides authentication checking, such as
- * m_ldap_authentication or m_sql_authentication.
+ * ldap_authentication or sql_authentication.
  *
- * With enc_none, passwords will be stored in plain text, allowing for passwords
+ * With encryption/none, passwords will be stored in plain text, allowing for passwords
  * to be recovered later but it isn't secure and therefore is not recommended.
  *
  * The other encryption modules use one-way encryption, so the passwords can not
@@ -1158,21 +1158,16 @@ module
  *
  */
 
-#module { name = "enc_bcrypt" }
-module { name = "enc_sha256" }
-
-/*
- * When using enc_none, passwords will be stored without encryption. This isn't secure
- * therefore it is not recommended.
- */
-#module { name = "enc_none" }
+#module { name = "encryption/bcrypt" }
+module { name = "encryption/sha256" }
 
 /*
  * [DEPRECATED] Deprecated encryption modules.
  */
-#module { name = "enc_md5" }
-#module { name = "enc_sha1" }
-#module { name = "enc_old" }
+#module { name = "encryption/md5" }
+#module { name = "encryption/sha1" }
+#module { name = "encryption/old" }
+#module { name = "encryption/none" }
 
 
 /* Extra (optional) modules. */
diff --git a/data/global.example.conf b/data/global.example.conf
index a299885aa..d6c856aea 100644
--- a/data/global.example.conf
+++ b/data/global.example.conf
@@ -49,7 +49,7 @@ service
  */
 module
 {
-	name = "global"
+	name = "global/main"
 
 	/*
 	 * The name of the client that should be Global.
@@ -96,11 +96,11 @@ module
 command { service = "Global"; name = "HELP"; command = "generic/help"; }
 
 /*
- * gl_global
+ * global/global
  *
  * Provides the command global/global.
  *
  * Used for sending a message to every online user.
  */
-module { name = "gl_global" }
+module { name = "global/global" }
 command { service = "Global"; name = "GLOBAL"; command = "global/global"; permission = "global/global"; }
diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf
index 47fa6f44f..685eb9722 100644
--- a/data/hostserv.example.conf
+++ b/data/hostserv.example.conf
@@ -49,7 +49,7 @@ service
  */
 module
 {
-	name = "hostserv"
+	name = "hostserv/main"
 
 	/*
 	 * The name of the client that should be HostServ.
@@ -77,18 +77,18 @@ module
 command { service = "HostServ"; name = "HELP"; command = "generic/help"; }
 
 /*
- * hs_del
+ * hostserv/del
  *
  * Provides the commands hostserv/del and hostserv/delall.
  *
  * Used for removing users' vHosts.
  */
-module { name = "hs_del" }
+module { name = "hostserv/del" }
 command { service = "HostServ"; name = "DEL"; command = "hostserv/del"; permission = "hostserv/del"; }
 command { service = "HostServ"; name = "DELALL"; command = "hostserv/delall"; permission = "hostserv/del"; }
 
 /*
- * hs_group
+ * hostserv/group
  *
  * Provides the command hostserv/group.
  *
@@ -96,7 +96,7 @@ command { service = "HostServ"; name = "DELALL"; command = "hostserv/delall"; pe
  */
 module
 {
-	name = "hs_group"
+	name = "hostserv/group"
 
 	/*
 	 * Upon nickserv/group, this option syncs the nick's main vHost to the grouped nick.
@@ -111,37 +111,37 @@ module
 command { service = "HostServ"; name = "GROUP"; command = "hostserv/group"; }
 
 /*
- * hs_list
+ * hostserv/list
  *
  * Provides the command hostserv/list.
  *
  * Used for listing actively set vHosts.
  */
-module { name = "hs_list" }
+module { name = "hostserv/list" }
 command { service = "HostServ"; name = "LIST"; command = "hostserv/list"; permission = "hostserv/list"; }
 
 /*
- * hs_off
+ * hostserv/off
  *
  * Provides the command hostserv/off.
  *
  * Used for turning off your vHost.
  */
-module { name = "hs_off" }
+module { name = "hostserv/off" }
 command { service = "HostServ"; name = "OFF"; command = "hostserv/off"; }
 
 /*
- * hs_on
+ * hostserv/on
  *
  * Provides the command hostserv/on.
  *
  * Used for turning on your vHost.
  */
-module { name = "hs_on" }
+module { name = "hostserv/on" }
 command { service = "HostServ"; name = "ON"; command = "hostserv/on"; }
 
 /*
- * hs_request
+ * hostserv/request
  *
  * Provides the commands hostserv/request, hostserv/activate, hostserv/reject, and hostserv/waiting.
  *
@@ -149,7 +149,7 @@ command { service = "HostServ"; name = "ON"; command = "hostserv/on"; }
  */
 module
 {
-	name = "hs_request"
+	name = "hostserv/request"
 
 	/*
 	 * If set, Services will send a memo to the user requesting a vHost when it's been
@@ -168,12 +168,12 @@ command { service = "HostServ"; name = "REJECT"; command = "hostserv/reject"; pe
 command { service = "HostServ"; name = "WAITING"; command = "hostserv/waiting"; permission = "hostserv/set"; }
 
 /*
- * hs_set
+ * hostserv/set
  *
  * Provides the commands hostserv/set and hostserv/setall.
  *
  * Used for setting users' vHosts.
  */
-module { name = "hs_set" }
+module { name = "hostserv/set" }
 command { service = "HostServ"; name = "SET"; command = "hostserv/set"; permission = "hostserv/set"; }
 command { service = "HostServ"; name = "SETALL"; command = "hostserv/setall"; permission = "hostserv/set"; }
diff --git a/data/hybrid.example.conf b/data/hybrid.example.conf
index 2af525c28..c44e67ca9 100644
--- a/data/hybrid.example.conf
+++ b/data/hybrid.example.conf
@@ -1,7 +1,7 @@
 
 module
 {
-	name = "hybrid"
+	name = "protocol/hybrid"
 }
 
 usermode
diff --git a/data/inspircd20.example.conf b/data/inspircd20.example.conf
index 133b86089..db3611519 100644
--- a/data/inspircd20.example.conf
+++ b/data/inspircd20.example.conf
@@ -1,7 +1,7 @@
 
 module
 {
-	name = "inspircd20"
+	name = "protocol/inspircd20"
 
 	/*
 	 * Enables mode locks server-side. This reduces the spam caused by
diff --git a/data/memoserv.example.conf b/data/memoserv.example.conf
index c001fa93d..cda9a02ae 100644
--- a/data/memoserv.example.conf
+++ b/data/memoserv.example.conf
@@ -49,7 +49,7 @@ service
  */
 module
 {
-	name = "memoserv"
+	name = "memoserv/main"
 	/*
 	 * The name of the client that should be MemoServ. Clients are configured
 	 * with the service blocks.
@@ -92,37 +92,37 @@ module
 command { service = "MemoServ"; name = "HELP"; command = "generic/help"; }
 
 /*
- * ms_cancel
+ * memoserv/cancel
  *
  * Provides the command memoserv/cancel.
  *
  * Used to cancel memos already sent but not yet read.
  */
-module { name = "ms_cancel" }
+module { name = "memoserv/cancel" }
 command { service = "MemoServ"; name = "CANCEL"; command = "memoserv/cancel"; }
 
 /*
- * ms_check
+ * memoserv/check
  *
  * Provides the command memoserv/check.
  *
  * Used to check if a sent memo has been read.
  */
-module { name = "ms_check" }
+module { name = "memoserv/check" }
 command { service = "Me