Rename haader file names to be consistent with module names

89 files changed, 101 insertions, 101 deletions

diff --git a/include/modules/bs_badwords.h b/include/modules/botserv/badwords.h
index 87986ee62..87986ee62 100644
--- a/include/modules/bs_badwords.h
+++ b/include/modules/botserv/badwords.h
diff --git a/include/modules/bs_bot.h b/include/modules/botserv/bot.h
index fe6534309..fe6534309 100644
--- a/include/modules/bs_bot.h
+++ b/include/modules/botserv/bot.h
diff --git a/include/modules/bs_info.h b/include/modules/botserv/info.h
index 1ebd58c89..1ebd58c89 100644
--- a/include/modules/bs_info.h
+++ b/include/modules/botserv/info.h
diff --git a/include/modules/bs_kick.h b/include/modules/botserv/kick.h
index 1346d7427..1346d7427 100644
--- a/include/modules/bs_kick.h
+++ b/include/modules/botserv/kick.h
diff --git a/include/modules/cs_access.h b/include/modules/chanserv/access.h
index 54eb3f353..54eb3f353 100644
--- a/include/modules/cs_access.h
+++ b/include/modules/chanserv/access.h
diff --git a/include/modules/cs_akick.h b/include/modules/chanserv/akick.h
index 966dac15b..966dac15b 100644
--- a/include/modules/cs_akick.h
+++ b/include/modules/chanserv/akick.h
diff --git a/include/modules/cs_drop.h b/include/modules/chanserv/drop.h
index db231059b..db231059b 100644
--- a/include/modules/cs_drop.h
+++ b/include/modules/chanserv/drop.h
diff --git a/include/modules/cs_entrymsg.h b/include/modules/chanserv/entrymsg.h
index b5804068f..b5804068f 100644
--- a/include/modules/cs_entrymsg.h
+++ b/include/modules/chanserv/entrymsg.h
diff --git a/include/modules/cs_info.h b/include/modules/chanserv/info.h
index f80e3daf2..f80e3daf2 100644
--- a/include/modules/cs_info.h
+++ b/include/modules/chanserv/info.h
diff --git a/include/modules/cs_log.h b/include/modules/chanserv/log.h
index d940f5e87..d940f5e87 100644
--- a/include/modules/cs_log.h
+++ b/include/modules/chanserv/log.h
diff --git a/include/modules/cs_mode.h b/include/modules/chanserv/mode.h
index 4c7965e2a..4c7965e2a 100644
--- a/include/modules/cs_mode.h
+++ b/include/modules/chanserv/mode.h
diff --git a/include/modules/cs_set.h b/include/modules/chanserv/set.h
index a0e81c888..a0e81c888 100644
--- a/include/modules/cs_set.h
+++ b/include/modules/chanserv/set.h
diff --git a/include/modules/cs_set_misc.h b/include/modules/chanserv/set_misc.h
index 65b92cc89..65b92cc89 100644
--- a/include/modules/cs_set_misc.h
+++ b/include/modules/chanserv/set_misc.h
diff --git a/include/modules/cs_suspend.h b/include/modules/chanserv/suspend.h
index 27187ea09..27187ea09 100644
--- a/include/modules/cs_suspend.h
+++ b/include/modules/chanserv/suspend.h
diff --git a/include/modules/hs_del.h b/include/modules/hostserv/del.h
index 9b2ea39ef..9b2ea39ef 100644
--- a/include/modules/hs_del.h
+++ b/include/modules/hostserv/del.h
diff --git a/include/modules/ns_access.h b/include/modules/nickserv/access.h
index 73a625f3d..73a625f3d 100644
--- a/include/modules/ns_access.h
+++ b/include/modules/nickserv/access.h
diff --git a/include/modules/ns_ajoin.h b/include/modules/nickserv/ajoin.h
index 7b4cc20e5..7b4cc20e5 100644
--- a/include/modules/ns_ajoin.h
+++ b/include/modules/nickserv/ajoin.h
diff --git a/include/modules/ns_cert.h b/include/modules/nickserv/cert.h
index be75fb9bf..be75fb9bf 100644
--- a/include/modules/ns_cert.h
+++ b/include/modules/nickserv/cert.h
diff --git a/include/modules/ns_drop.h b/include/modules/nickserv/drop.h
index bae9d77b6..bae9d77b6 100644
--- a/include/modules/ns_drop.h
+++ b/include/modules/nickserv/drop.h
diff --git a/include/modules/ns_group.h b/include/modules/nickserv/group.h
index caa568a9e..caa568a9e 100644
--- a/include/modules/ns_group.h
+++ b/include/modules/nickserv/group.h
diff --git a/include/modules/ns_info.h b/include/modules/nickserv/info.h
index e816cc356..e816cc356 100644
--- a/include/modules/ns_info.h
+++ b/include/modules/nickserv/info.h
diff --git a/include/modules/ns_set.h b/include/modules/nickserv/set.h
index c6b86032b..c6b86032b 100644
--- a/include/modules/ns_set.h
+++ b/include/modules/nickserv/set.h
diff --git a/include/modules/ns_set_misc.h b/include/modules/nickserv/set_misc.h
index 18d49dd0f..18d49dd0f 100644
--- a/include/modules/ns_set_misc.h
+++ b/include/modules/nickserv/set_misc.h
diff --git a/include/modules/ns_suspend.h b/include/modules/nickserv/suspend.h
index fcfc0265d..fcfc0265d 100644
--- a/include/modules/ns_suspend.h
+++ b/include/modules/nickserv/suspend.h
diff --git a/include/modules/ns_update.h b/include/modules/nickserv/update.h
index ce75c33ac..ce75c33ac 100644
--- a/include/modules/ns_update.h
+++ b/include/modules/nickserv/update.h
diff --git a/include/modules/os_defcon.h b/include/modules/operserv/defcon.h
index f980d5008..f980d5008 100644
--- a/include/modules/os_defcon.h
+++ b/include/modules/operserv/defcon.h
diff --git a/include/modules/os_dns.h b/include/modules/operserv/dns.h
index d76cd3d62..d76cd3d62 100644
--- a/include/modules/os_dns.h
+++ b/include/modules/operserv/dns.h
diff --git a/include/modules/os_forbid.h b/include/modules/operserv/forbid.h
index 9b21defec..9b21defec 100644
--- a/include/modules/os_forbid.h
+++ b/include/modules/operserv/forbid.h
diff --git a/include/modules/os_ignore.h b/include/modules/operserv/ignore.h
index 2326b5575..2326b5575 100644
--- a/include/modules/os_ignore.h
+++ b/include/modules/operserv/ignore.h
diff --git a/include/modules/os_info.h b/include/modules/operserv/info.h
index 6e819158d..6e819158d 100644
--- a/include/modules/os_info.h
+++ b/include/modules/operserv/info.h
diff --git a/include/modules/os_news.h b/include/modules/operserv/news.h
index 07627b1bc..07627b1bc 100644
--- a/include/modules/os_news.h
+++ b/include/modules/operserv/news.h
diff --git a/include/modules/os_session.h b/include/modules/operserv/session.h
index b9afd196e..b9afd196e 100644
--- a/include/modules/os_session.h
+++ b/include/modules/operserv/session.h
diff --git a/modules/botserv/assign.cpp b/modules/botserv/assign.cpp
index 840651dfc..1d2755ad5 100644
--- a/modules/botserv/assign.cpp
+++ b/modules/botserv/assign.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/bs_info.h"
+#include "modules/botserv/info.h"
 
 class CommandBSAssign : public Command
 {
diff --git a/modules/botserv/badwords.cpp b/modules/botserv/badwords.cpp
index 6a092e36b..afdc2e09f 100644
--- a/modules/botserv/badwords.cpp
+++ b/modules/botserv/badwords.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/bs_badwords.h"
+#include "modules/botserv/badwords.h"
 
 static EventHandlers<Event::BadWordEvents> *bwevents;
 
diff --git a/modules/botserv/bot.cpp b/modules/botserv/bot.cpp
index 726c02ab2..b2630bfcb 100644
--- a/modules/botserv/bot.cpp
+++ b/modules/botserv/bot.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/bs_bot.h"
+#include "modules/botserv/bot.h"
 
 class CommandBSBot : public Command
 {
diff --git a/modules/botserv/info.cpp b/modules/botserv/info.cpp
index 6d74c308e..19fe0a775 100644
--- a/modules/botserv/info.cpp
+++ b/modules/botserv/info.cpp
@@ -12,7 +12,7 @@
  */
 
 #include "module.h"
-#include "modules/bs_info.h"
+#include "modules/botserv/info.h"
 
 class CommandBSInfo : public Command
 {
diff --git a/modules/botserv/kick.cpp b/modules/botserv/kick.cpp
index 70ed5b2ad..f61c7eb94 100644
--- a/modules/botserv/kick.cpp
+++ b/modules/botserv/kick.cpp
@@ -12,9 +12,9 @@
  */
 
 #include "module.h"
-#include "modules/bs_kick.h"
-#include "modules/bs_badwords.h"
-#include "modules/bs_info.h"
+#include "modules/botserv/kick.h"
+#include "modules/botserv/badwords.h"
+#include "modules/botserv/info.h"
 
 static Module *me;
 
diff --git a/modules/botserv/set.cpp b/modules/botserv/set.cpp
index 6e2ae998f..b480108af 100644
--- a/modules/botserv/set.cpp
+++ b/modules/botserv/set.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/bs_kick.h"
+#include "modules/botserv/kick.h"
 
 class CommandBSSet : public Command
 {
diff --git a/modules/chanserv/akick.cpp b/modules/chanserv/akick.cpp
index 8cd1f778a..68adec8df 100644
--- a/modules/chanserv/akick.cpp
+++ b/modules/chanserv/akick.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_akick.h"
+#include "modules/chanserv/akick.h"
 
 class AutoKickImpl : public AutoKick
 {
diff --git a/modules/chanserv/clone.cpp b/modules/chanserv/clone.cpp
index 256446bd1..0cc1b2739 100644
--- a/modules/chanserv/clone.cpp
+++ b/modules/chanserv/clone.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/bs_badwords.h"
-#include "modules/cs_akick.h"
+#include "modules/botserv/badwords.h"
+#include "modules/chanserv/akick.h"
 
 class CommandCSClone : public Command
 {
diff --git a/modules/chanserv/drop.cpp b/modules/chanserv/drop.cpp
index a1020bcab..cb2036694 100644
--- a/modules/chanserv/drop.cpp
+++ b/modules/chanserv/drop.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_drop.h"
+#include "modules/chanserv/drop.h"
 
 class CommandCSDrop : public Command
 {
diff --git a/modules/chanserv/entrymsg.cpp b/modules/chanserv/entrymsg.cpp
index 31253599e..ac46809fd 100644
--- a/modules/chanserv/entrymsg.cpp
+++ b/modules/chanserv/entrymsg.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_entrymsg.h"
+#include "modules/chanserv/entrymsg.h"
 
 class EntryMsgImpl : public EntryMsg
 {
diff --git a/modules/chanserv/info.cpp b/modules/chanserv/info.cpp
index 267aee66a..4f3895cc4 100644
--- a/modules/chanserv/info.cpp
+++ b/modules/chanserv/info.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_info.h"
+#include "modules/chanserv/info.h"
 
 class CommandCSInfo : public Command
 {
diff --git a/modules/chanserv/list.cpp b/modules/chanserv/list.cpp
index 5a4c58bff..ad0460239 100644
--- a/modules/chanserv/list.cpp
+++ b/modules/chanserv/list.cpp
@@ -10,9 +10,9 @@
  */
 
 #include "module.h"
-#include "modules/cs_info.h"
-#include "modules/cs_set.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/info.h"
+#include "modules/chanserv/set.h"
+#include "modules/chanserv/mode.h"
 
 class CommandCSList : public Command
 {
diff --git a/modules/chanserv/log.cpp b/modules/chanserv/log.cpp
index 6a90115f5..43ed76291 100644
--- a/modules/chanserv/log.cpp
+++ b/modules/chanserv/log.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_log.h"
+#include "modules/chanserv/log.h"
 #include "modules/memoserv.h"
 
 class LogSettingImpl : public LogSetting
diff --git a/modules/chanserv/main/channel.cpp b/modules/chanserv/main/channel.cpp
index b24edcc0c..7190b8bd9 100644
--- a/modules/chanserv/main/channel.cpp
+++ b/modules/chanserv/main/channel.cpp
@@ -12,7 +12,7 @@
 
 #include "module.h"
 #include "channeltype.h"
-#include "modules/cs_akick.h"
+#include "modules/chanserv/akick.h"
 
 ChannelImpl::ChannelImpl(Serialize::TypeBase *type, const Anope::string &chname) : ChanServ::Channel(type)
 {
diff --git a/modules/chanserv/main/chanserv.cpp b/modules/chanserv/main/chanserv.cpp
index 420051252..9336b7c53 100644
--- a/modules/chanserv/main/chanserv.cpp
+++ b/modules/chanserv/main/chanserv.cpp
@@ -10,12 +10,12 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 #include "modules/help.h"
-#include "modules/bs_bot.h"
+#include "modules/botserv/bot.h"
 #include "modules/chanserv.h"
-#include "modules/cs_info.h"
-#include "modules/cs_akick.h"
+#include "modules/chanserv/info.h"
+#include "modules/chanserv/akick.h"
 #include "channeltype.h"
 #include "leveltype.h"
 #include "modetype.h"
diff --git a/modules/chanserv/mode.cpp b/modules/chanserv/mode.cpp
index 121179a58..eb1350e5a 100644
--- a/modules/chanserv/mode.cpp
+++ b/modules/chanserv/mode.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
-#include "modules/cs_info.h"
+#include "modules/chanserv/mode.h"
+#include "modules/chanserv/info.h"
 
 static EventHandlers<Event::MLockEvents> *events;
 
diff --git a/modules/chanserv/set.cpp b/modules/chanserv/set.cpp
index 06c996f52..a56afa141 100644
--- a/modules/chanserv/set.cpp
+++ b/modules/chanserv/set.cpp
@@ -10,10 +10,10 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 #include "modules/chanserv.h"
-#include "modules/cs_info.h"
-#include "modules/cs_set.h"
+#include "modules/chanserv/info.h"
+#include "modules/chanserv/set.h"
 
 class CommandCSSet : public Command
 {
diff --git a/modules/chanserv/set_misc.cpp b/modules/chanserv/set_misc.cpp
index 7af347087..71087138a 100644
--- a/modules/chanserv/set_misc.cpp
+++ b/modules/chanserv/set_misc.cpp
@@ -9,9 +9,9 @@
  */
 
 #include "module.h"
-#include "modules/cs_set_misc.h"
-#include "modules/cs_info.h"
-#include "modules/cs_set.h"
+#include "modules/chanserv/set_misc.h"
+#include "modules/chanserv/info.h"
+#include "modules/chanserv/set.h"
 
 static Anope::map<Anope::string> descriptions;
 
diff --git a/modules/chanserv/status.cpp b/modules/chanserv/status.cpp
index 35676fa53..98dbbe8d2 100644
--- a/modules/chanserv/status.cpp
+++ b/modules/chanserv/status.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_akick.h"
+#include "modules/chanserv/akick.h"
 
 class CommandCSStatus : public Command
 {
diff --git a/modules/chanserv/suspend.cpp b/modules/chanserv/suspend.cpp
index 73a034192..44259f341 100644
--- a/modules/chanserv/suspend.cpp
+++ b/modules/chanserv/suspend.cpp
@@ -10,10 +10,10 @@
  */
 
 #include "module.h"
-#include "modules/cs_suspend.h"
-#include "modules/cs_drop.h"
+#include "modules/chanserv/suspend.h"
+#include "modules/chanserv/drop.h"
 #include "modules/chanserv.h"
-#include "modules/cs_info.h"
+#include "modules/chanserv/info.h"
 
 class CSSuspendInfoImpl : public CSSuspendInfo
 {
diff --git a/modules/chanserv/topic.cpp b/modules/chanserv/topic.cpp
index a132900a6..aab3f8dbf 100644
--- a/modules/chanserv/topic.cpp
+++ b/modules/chanserv/topic.cpp
@@ -10,9 +10,9 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
-#include "modules/cs_info.h"
-#include "modules/cs_set.h"
+#include "modules/chanserv/mode.h"
+#include "modules/chanserv/info.h"
+#include "modules/chanserv/set.h"
 
 class CommandCSSetKeepTopic : public Command
 {
diff --git a/modules/database/old.cpp b/modules/database/old.cpp
index 3d9b92922..27fb3565d 100644
--- a/modules/database/old.cpp
+++ b/modules/database/old.cpp
@@ -9,17 +9,17 @@
  */
 
 #include "module.h"
-#include "modules/os_session.h"
-#include "modules/bs_kick.h"
-#include "modules/cs_mode.h"
-#include "modules/bs_badwords.h"
-#include "modules/os_news.h"
-#include "modules/os_forbid.h"
-#include "modules/cs_entrymsg.h"
-#include "modules/ns_suspend.h"
-#include "modules/cs_suspend.h"
-#include "modules/cs_access.h"
-#include "modules/ns_access.h"
+#include "modules/operserv/session.h"
+#include "modules/botserv/kick.h"
+#include "modules/chanserv/mode.h"
+#include "modules/botserv/badwords.h"
+#include "modules/operserv/news.h"
+#include "modules/operserv/forbid.h"
+#include "modules/chanserv/entrymsg.h"
+#include "modules/nickserv/suspend.h"
+#include "modules/chanserv/suspend.h"
+#include "modules/chanserv/access.h"
+#include "modules/nickserv/access.h"
 
 #define READ(x) \
 if (true) \
diff --git a/modules/fantasy.cpp b/modules/fantasy.cpp
index 3781b5b83..3730f7e70 100644
--- a/modules/fantasy.cpp
+++ b/modules/fantasy.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 #include "modules/fantasy.h"
-#include "modules/bs_info.h"
+#include "modules/botserv/info.h"
 
 class CommandBSSetFantasy : public Command
 {
diff --git a/modules/greet.cpp b/modules/greet.cpp
index ebc8c1612..69039849c 100644
--- a/modules/greet.cpp
+++ b/modules/greet.cpp
@@ -10,9 +10,9 @@
  */
 
 #include "module.h"
-#include "modules/ns_info.h"
-#include "modules/bs_info.h"
-#include "modules/ns_set.h"
+#include "modules/nickserv/info.h"
+#include "modules/botserv/info.h"
+#include "modules/nickserv/set.h"
 
 class CommandBSSetGreet : public Command
 {
diff --git a/modules/hostserv/del.cpp b/modules/hostserv/del.cpp
index b45c10a61..0830cd5b5 100644
--- a/modules/hostserv/del.cpp
+++ b/modules/hostserv/del.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/hs_del.h"
+#include "modules/hostserv/del.h"
 
 class CommandHSDel : public Command
 {
diff --git a/modules/hostserv/group.cpp b/modules/hostserv/group.cpp
index c3971fdea..3aff66e27 100644
--- a/modules/hostserv/group.cpp
+++ b/modules/hostserv/group.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/ns_group.h"
+#include "modules/nickserv/group.h"
 
 class CommandHSGroup : public Command
 {
diff --git a/modules/hostserv/main/hostserv.cpp b/modules/hostserv/main/hostserv.cpp
index 285ea893b..8fdfa560e 100644
--- a/modules/hostserv/main/hostserv.cpp
+++ b/modules/hostserv/main/hostserv.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/ns_update.h"
-#include "modules/hs_del.h"
+#include "modules/nickserv/update.h"
+#include "modules/hostserv/del.h"
 #include "modules/help.h"
 
 class HostServCore : public Module
diff --git a/modules/memoserv/main/memoserv.cpp b/modules/memoserv/main/memoserv.cpp
index a52ee746c..ed3939ef7 100644
--- a/modules/memoserv/main/memoserv.cpp
+++ b/modules/memoserv/main/memoserv.cpp
@@ -10,9 +10,9 @@
  */
 
 #include "module.h"
-#include "modules/ns_update.h"
+#include "modules/nickserv/update.h"
 #include "modules/help.h"
-#include "modules/bs_bot.h"
+#include "modules/botserv/bot.h"
 #include "modules/memoserv.h"
 //#include "memoinfo.h"
 //#include "memo.h"
diff --git a/modules/nickserv/access.cpp b/modules/nickserv/access.cpp
index ba2116ac9..0e405484c 100644
--- a/modules/nickserv/access.cpp
+++ b/modules/nickserv/access.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 #include "modules/nickserv.h"
-#include "modules/ns_access.h"
+#include "modules/nickserv/access.h"
 
 class NickAccessImpl : public NickAccess
 {
diff --git a/modules/nickserv/ajoin.cpp b/modules/nickserv/ajoin.cpp
index 135beb403..0b074a84a 100644
--- a/modules/nickserv/ajoin.cpp
+++ b/modules/nickserv/ajoin.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/ns_ajoin.h"
+#include "modules/nickserv/ajoin.h"
 
 class AutoJoinImpl : public AutoJoin
 {
diff --git a/modules/nickserv/cert.cpp b/modules/nickserv/cert.cpp
index fc87f8cb0..23487f305 100644
--- a/modules/nickserv/cert.cpp
+++ b/modules/nickserv/cert.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
 #include "modules/nickserv.h"
 
 static Anope::hash_map<NickServ::Account *> certmap;
diff --git a/modules/nickserv/drop.cpp b/modules/nickserv/drop.cpp
index 62ee41970..e1eba9a3c 100644
--- a/modules/nickserv/drop.cpp
+++ b/modules/nickserv/drop.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/ns_drop.h"
+#include "modules/nickserv/drop.h"
 
 class CommandNSDrop : public Command
 {
diff --git a/modules/nickserv/group.cpp b/modules/nickserv/group.cpp
index 9a9b933f4..3a50d0306 100644
--- a/modules/nickserv/group.cpp
+++ b/modules/nickserv/group.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/ns_cert.h"
-#include "modules/ns_group.h"
+#include "modules/nickserv/cert.h"
+#include "modules/nickserv/group.h"
 
 class NSGroupRequestListener : public NickServ::IdentifyRequestListener
 {
diff --git a/modules/nickserv/info.cpp b/modules/nickserv/info.cpp
index 7091e53fd..0bc712ac9 100644
--- a/modules/nickserv/info.cpp
+++ b/modules/nickserv/info.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/ns_info.h"
-#include "modules/ns_set.h"
+#include "modules/nickserv/info.h"
+#include "modules/nickserv/set.h"
 
 class CommandNSInfo : public Command
 {
diff --git a/modules/nickserv/list.cpp b/modules/nickserv/list.cpp
index 2820326d2..53a3a9394 100644
--- a/modules/nickserv/list.cpp
+++ b/modules/nickserv/list.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/ns_info.h"
-#include "modules/ns_set.h"
+#include "modules/nickserv/info.h"
+#include "modules/nickserv/set.h"
 
 class CommandNSList : public Command
 {
diff --git a/modules/nickserv/main/account.cpp b/modules/nickserv/main/account.cpp
index 85adf1a33..d74154d97 100644
--- a/modules/nickserv/main/account.cpp
+++ b/modules/nickserv/main/account.cpp
@@ -12,7 +12,7 @@
 
 #include "module.h"
 #include "accounttype.h"
-#include "modules/ns_access.h"
+#include "modules/nickserv/access.h"
 
 AccountImpl::~AccountImpl()
 {
diff --git a/modules/nickserv/main/nickserv.cpp b/modules/nickserv/main/nickserv.cpp
index f14a71d87..85ac34b12 100644
--- a/modules/nickserv/main/nickserv.cpp
+++ b/modules/nickserv/main/nickserv.cpp
@@ -10,9 +10,9 @@
  */
 
 #include "module.h"
-#include "modules/ns_info.h"
-#include "modules/ns_group.h"
-#include "modules/ns_update.h"
+#include "modules/nickserv/info.h"
+#include "modules/nickserv/group.h"
+#include "modules/nickserv/update.h"
 #include "modules/help.h"
 #include "modules/nickserv.h"
 #include "identifyrequest.h"
diff --git a/modules/nickserv/recover.cpp b/modules/nickserv/recover.cpp
index 65033bab9..c95d3f135 100644
--- a/modules/nickserv/recover.cpp
+++ b/modules/nickserv/recover.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
 #include "modules/nickserv.h"
 
 typedef std::map<Anope::string, ChannelStatus> NSRecoverInfo;
diff --git a/modules/nickserv/set.cpp b/modules/nickserv/set.cpp
index a75386743..337bdab9d 100644
--- a/modules/nickserv/set.cpp
+++ b/modules/nickserv/set.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/ns_info.h"
-#include "modules/ns_set.h"
+#include "modules/nickserv/info.h"
+#include "modules/nickserv/set.h"
 #include "modules/nickserv.h"
 
 class CommandNSSet : public Command
diff --git a/modules/nickserv/set_misc.cpp b/modules/nickserv/set_misc.cpp
index 5d03797b1..347ae034c 100644
--- a/modules/nickserv/set_misc.cpp
+++ b/modules/nickserv/set_misc.cpp
@@ -10,9 +10,9 @@
  */
 
 #include "module.h"
-#include "modules/ns_set_misc.h"
-#include "modules/ns_info.h"
-#include "modules/ns_set.h"
+#include "modules/nickserv/set_misc.h"
+#include "modules/nickserv/info.h"
+#include "modules/nickserv/set.h"
 
 static Anope::map<Anope::string> descriptions;
 
diff --git a/modules/nickserv/suspend.cpp b/modules/nickserv/suspend.cpp
index 2859eacc1..b56e68f97 100644
--- a/modules/nickserv/suspend.cpp
+++ b/modules/nickserv/suspend.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/ns_suspend.h"
-#include "modules/ns_info.h"
+#include "modules/nickserv/suspend.h"
+#include "modules/nickserv/info.h"
 #include "modules/nickserv.h"
 
 class NSSuspendInfoImpl : public NSSuspendInfo
diff --git a/modules/nickserv/update.cpp b/modules/nickserv/update.cpp
index 0022f389d..6781585d3 100644
--- a/modules/nickserv/update.cpp
+++ b/modules/nickserv/update.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/ns_update.h"
+#include "modules/nickserv/update.h"
 
 class CommandNSUpdate : public Command
 {
diff --git a/modules/operserv/defcon.cpp b/modules/operserv/defcon.cpp
index 804b66c27..fc4a096c9 100644
--- a/modules/operserv/defcon.cpp
+++ b/modules/operserv/defcon.cpp
@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/os_session.h"
-#include "modules/os_defcon.h"
+#include "modules/operserv/session.h"
+#include "modules/operserv/defcon.h"
 #include "modules/global.h"
 
 enum DefconLevel
diff --git a/modules/operserv/dns.cpp b/modules/operserv/dns.cpp
index a231a1e74..1d714700d 100644
--- a/modules/operserv/dns.cpp
+++ b/modules/operserv/dns.cpp
@@ -7,7 +7,7 @@
 
 #include "module.h"
 #include "modules/dns.h"
-#include "modules/os_dns.h"
+#include "modules/operserv/dns.h"
 
 static std::map<Anope::string, std::list<time_t> > server_quit_times;
 
diff --git a/modules/operserv/forbid.cpp b/modules/operserv/forbid.cpp
index 0a7b1c209..2375eddcd 100644
--- a/modules/operserv/forbid.cpp
+++ b/modules/operserv/forbid.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_forbid.h"
+#include "modules/operserv/forbid.h"
 #include "modules/nickserv.h"
 #include "modules/chanserv.h"
 
diff --git a/modules/operserv/ignore.cpp b/modules/operserv/ignore.cpp
index c55e6f3dc..0aeab0718 100644
--- a/modules/operserv/ignore.cpp
+++ b/modules/operserv/ignore.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_ignore.h"
+#include "modules/operserv/ignore.h"
 
 class IgnoreImpl : public Ignore
 {
diff --git a/modules/operserv/info.cpp b/modules/operserv/info.cpp
index c7749c589..bb0eb8274 100644
--- a/modules/operserv/info.cpp
+++ b/modules/operserv/info.cpp
@@ -7,9 +7,9 @@
  */
 
 #include "module.h"
-#include "modules/ns_info.h"
-#include "modules/cs_info.h"
-#include "modules/os_info.h"
+#include "modules/nickserv/info.h"
+#include "modules/chanserv/info.h"
+#include "modules/operserv/info.h"
 
 class OperInfoImpl : public OperInfo
 {
diff --git a/modules/operserv/news.cpp b/modules/operserv/news.cpp
index 03a1e3a57..c14103f2e 100644
--- a/modules/operserv/news.cpp
+++ b/modules/operserv/news.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_news.h"
+#include "modules/operserv/news.h"
 
 /* List of messages for each news type.  This simplifies message sending. */
 
diff --git a/modules/operserv/session.cpp b/modules/operserv/session.cpp
index 997914360..0c20e6d7a 100644
--- a/modules/operserv/session.cpp
+++ b/modules/operserv/session.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_session.h"
+#include "modules/operserv/session.h"
 
 namespace
 {
diff --git a/modules/operserv/stats.cpp b/modules/operserv/stats.cpp
index 6e74303ce..025fe566c 100644
--- a/modules/operserv/stats.cpp
+++ b/modules/operserv/stats.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_session.h"
+#include "modules/operserv/session.h"
 
 #if 0
 struct Stats : Serialize::Object
diff --git a/modules/protocol/charybdis.cpp b/modules/protocol/charybdis.cpp
index 50da90902..fc59a7214 100644
--- a/modules/protocol/charybdis.cpp
+++ b/modules/protocol/charybdis.cpp
@@ -11,7 +11,7 @@
 
 #if 0
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 #include "modules/sasl.h"
 
 static Anope::string UplinkSID;
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 63cdc1973..f4c8bcf37 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -11,8 +11,8 @@
 
 #include "module.h"
 #include "modules/sasl.h"
-#include "modules/cs_mode.h"
-#include "modules/cs_set.h"
+#include "modules/chanserv/mode.h"
+#include "modules/chanserv/set.h"
 
 struct SASLUser
 {
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index 6bcaaab26..3bb8ab93a 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 #include "modules/sasl.h"
 
 class UnrealIRCdProto : public IRCDProto
diff --git a/modules/sasl.cpp b/modules/sasl.cpp
index f12cae8b8..174e86ab0 100644
--- a/modules/sasl.cpp
+++ b/modules/sasl.cpp
@@ -8,7 +8,7 @@
 
 #include "module.h"
 #include "modules/sasl.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
 
 using namespace SASL;
 
diff --git a/modules/webcpanel/pages/chanserv/akick.cpp b/modules/webcpanel/pages/chanserv/akick.cpp
index 0cfaaaba9..97f6aa2ef 100644
--- a/modules/webcpanel/pages/chanserv/akick.cpp
+++ b/modules/webcpanel/pages/chanserv/akick.cpp
@@ -7,7 +7,7 @@
 
 #include "../../webcpanel.h"
 #include "utils.h"
-#include "modules/cs_akick.h"
+#include "modules/chanserv/akick.h"
 
 WebCPanel::ChanServ::Akick::Akick(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
diff --git a/modules/webcpanel/pages/nickserv/access.cpp b/modules/webcpanel/pages/nickserv/access.cpp
index 779f891b5..51472058d 100644
--- a/modules/webcpanel/pages/nickserv/access.cpp
+++ b/modules/webcpanel/pages/nickserv/access.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "../../webcpanel.h"
-#include "modules/ns_access.h"
+#include "modules/nickserv/access.h"
 
 WebCPanel::NickServ::Access::Access(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
diff --git a/modules/webcpanel/pages/nickserv/cert.cpp b/modules/webcpanel/pages/nickserv/cert.cpp
index 25958ca73..436725b04 100644
--- a/modules/webcpanel/pages/nickserv/cert.cpp
+++ b/modules/webcpanel/pages/nickserv/cert.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "../../webcpanel.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
 
 WebCPanel::NickServ::Cert::Cert(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {