Move some headers around.

include/module.h

@@ -45,7 +45,7 @@
 #include "users.h"
 #include "xline.h"
 
-#include "modules/pseudoclients/chanserv.h"
-#include "modules/pseudoclients/global.h"
-#include "modules/pseudoclients/memoserv.h"
-#include "modules/pseudoclients/nickserv.h"
+#include "modules/chanserv/service.h"
+#include "modules/global/service.h"
+#include "modules/memoserv/service.h"
+#include "modules/nickserv/service.h"

modules/botserv/bs_badwords.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/bs_badwords.h"
+#include "modules/botserv/badwords.h"
 
 struct BadWordImpl final
 	: BadWord

modules/botserv/bs_kick.cpp

@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/bs_kick.h"
-#include "modules/bs_badwords.h"
+#include "modules/botserv/kick.h"
+#include "modules/botserv/badwords.h"
 
 static Module *me;
 

modules/chanserv/chanserv.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 
 inline static Anope::string BotModes()
 {

modules/chanserv/cs_clone.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/bs_badwords.h"
+#include "modules/botserv/badwords.h"
 
 class CommandCSClone final
 	: public Command

modules/chanserv/cs_entrymsg.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_entrymsg.h"
+#include "modules/chanserv/entrymsg.h"
 
 struct EntryMsgImpl final
 	: EntryMsg

modules/chanserv/cs_list.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 
 class CommandCSList final
 	: public Command

modules/chanserv/cs_log.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_log.h"
+#include "modules/chanserv/log.h"
 
 struct LogSettingImpl final
 	: LogSetting

modules/chanserv/cs_mode.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 
 struct ModeLockImpl final
 	: ModeLock

modules/chanserv/cs_set.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 
 class CommandCSSet final
 	: public Command

modules/chanserv/cs_topic.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 
 class CommandCSSetKeepTopic final
 	: public Command

modules/database/db_atheme.cpp

@@ -12,17 +12,17 @@
 #include <functional>
 
 #include "module.h"
-#include "modules/bs_badwords.h"
-#include "modules/bs_kick.h"
-#include "modules/cs_entrymsg.h"
-#include "modules/cs_mode.h"
-#include "modules/hs_request.h"
+#include "modules/botserv/badwords.h"
+#include "modules/botserv/kick.h"
+#include "modules/chanserv/entrymsg.h"
+#include "modules/chanserv/mode.h"
+#include "modules/hostserv/request.h"
 #include "modules/info.h"
-#include "modules/ns_cert.h"
-#include "modules/os_forbid.h"
-#include "modules/os_news.h"
-#include "modules/os_oper.h"
-#include "modules/os_session.h"
+#include "modules/nickserv/cert.h"
+#include "modules/operserv/forbid.h"
+#include "modules/operserv/news.h"
+#include "modules/operserv/oper.h"
+#include "modules/operserv/session.h"
 #include "modules/set_misc.h"
 #include "modules/suspend.h"
 

modules/database/db_old.cpp

@@ -10,14 +10,14 @@
  */
 
 #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/botserv/badwords.h"
+#include "modules/botserv/kick.h"
+#include "modules/chanserv/entrymsg.h"
+#include "modules/chanserv/mode.h"
+#include "modules/operserv/forbid.h"
+#include "modules/operserv/news.h"
+#include "modules/operserv/session.h"
 #include "modules/suspend.h"
-#include "modules/os_forbid.h"
-#include "modules/cs_entrymsg.h"
 
 #define READ(x) \
 if (true) \

modules/hostserv/hs_request.cpp

@@ -15,7 +15,7 @@
  */
 
 #include "module.h"
-#include "modules/hs_request.h"
+#include "modules/hostserv/request.h"
 
 static ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ");
 

modules/nickserv/ns_cert.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
 
 static Anope::unordered_map<NickCore *> certmap;
 

modules/nickserv/ns_group.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
 
 static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
 

modules/nickserv/ns_recover.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
 
 static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
 

modules/nickserv/ns_sasl.cpp

@@ -7,8 +7,8 @@
  */
 
 #include "module.h"
-#include "modules/sasl.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
+#include "modules/nickserv/sasl.h"
 
 class Plain final
 	: public SASL::Mechanism

modules/operserv/os_defcon.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_session.h"
+#include "modules/operserv/session.h"
 
 enum DefconLevel
 {

modules/operserv/os_forbid.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_forbid.h"
+#include "modules/operserv/forbid.h"
 
 static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
 

modules/operserv/os_ignore.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_ignore.h"
+#include "modules/operserv/ignore.h"
 
 struct IgnoreDataImpl final
 	: IgnoreData

modules/operserv/os_news.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_news.h"
+#include "modules/operserv/news.h"
 
 // TODO: msgarray breaks the format string checking
 #ifdef __GNUC__

modules/operserv/os_oper.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_oper.h"
+#include "modules/operserv/oper.h"
 
 class CommandOSOper final
 	: public Command

modules/operserv/os_session.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_session.h"
+#include "modules/operserv/session.h"
 
 namespace
 {

modules/operserv/os_stats.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/os_session.h"
+#include "modules/operserv/session.h"
 
 struct Stats final
 	: Serializable

modules/protocol/hybrid.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 
 static Anope::string UplinkSID;
 static bool UseSVSAccount = false;  // Temporary backwards compatibility hack until old proto is deprecated

modules/protocol/inspircd.cpp

@@ -10,11 +10,11 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
 #include "modules/encryption.h"
 #include "modules/httpd.h"
-#include "modules/ns_cert.h"
-#include "modules/sasl.h"
+#include "modules/nickserv/cert.h"
+#include "modules/nickserv/sasl.h"
 
 typedef std::map<char, unsigned> ListLimits;
 

modules/protocol/plexus.cpp

@@ -10,7 +10,7 @@
  */
 
 #include "module.h"
-#include "modules/sasl.h"
+#include "modules/nickserv/sasl.h"
 
 static Anope::string UplinkSID;
 

modules/protocol/solanum.cpp

@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
-#include "modules/sasl.h"
+#include "modules/chanserv/mode.h"
+#include "modules/nickserv/sasl.h"
 
 static Anope::string UplinkSID;
 

modules/protocol/unrealircd.cpp

@@ -10,8 +10,8 @@
  */
 
 #include "module.h"
-#include "modules/cs_mode.h"
-#include "modules/sasl.h"
+#include "modules/chanserv/mode.h"
+#include "modules/nickserv/sasl.h"
 
 typedef Anope::map<Anope::string> ModData;
 

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)
 {