ModuleManager: remove fakederef.

42 files changed, 95 insertions, 95 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 7579ac771..f4e1d3b52 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -533,7 +533,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 void ServerConfig::ApplyModules(User* user)
 {
 	std::vector<std::string> added_modules;
-	ModuleManager::ModuleMap removed_modules = ServerInstance->Modules->GetModules();
+	ModuleManager::ModuleMap removed_modules = ServerInstance->Modules.GetModules();
 
 	ConfigTagList tags = ConfTags("module");
 	for(ConfigIter i = tags.first; i != tags.second; ++i)
@@ -556,7 +556,7 @@ void ServerConfig::ApplyModules(User* user)
 		// Don't remove core_*.so, just remove m_*.so
 		if (InspIRCd::Match(modname, "core_*.so", ascii_case_insensitive_map))
 			continue;
-		if (ServerInstance->Modules->Unload(i->second))
+		if (ServerInstance->Modules.Unload(i->second))
 		{
 			ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH UNLOADED MODULE: %s", modname.c_str());
 
@@ -568,19 +568,19 @@ void ServerConfig::ApplyModules(User* user)
 		else
 		{
 			if (user)
-				user->WriteNumeric(ERR_CANTUNLOADMODULE, modname, InspIRCd::Format("Failed to unload module %s: %s", modname.c_str(), ServerInstance->Modules->LastError().c_str()));
+				user->WriteNumeric(ERR_CANTUNLOADMODULE, modname, InspIRCd::Format("Failed to unload module %s: %s", modname.c_str(), ServerInstance->Modules.LastError().c_str()));
 			else
-				ServerInstance->SNO->WriteGlobalSno('a', "Failed to unload module %s: %s", modname.c_str(), ServerInstance->Modules->LastError().c_str());
+				ServerInstance->SNO->WriteGlobalSno('a', "Failed to unload module %s: %s", modname.c_str(), ServerInstance->Modules.LastError().c_str());
 		}
 	}
 
 	for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
 	{
 		// Skip modules which are already loaded.
-		if (ServerInstance->Modules->Find(*adding))
+		if (ServerInstance->Modules.Find(*adding))
 			continue;
 
-		if (ServerInstance->Modules->Load(*adding))
+		if (ServerInstance->Modules.Load(*adding))
 		{
 			ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
 			if (user)
@@ -591,9 +591,9 @@ void ServerConfig::ApplyModules(User* user)
 		else
 		{
 			if (user)
-				user->WriteNumeric(ERR_CANTLOADMODULE, *adding, InspIRCd::Format("Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str()));
+				user->WriteNumeric(ERR_CANTLOADMODULE, *adding, InspIRCd::Format("Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules.LastError().c_str()));
 			else
-				ServerInstance->SNO->WriteGlobalSno('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str());
+				ServerInstance->SNO->WriteGlobalSno('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules.LastError().c_str());
 		}
 	}
 }
@@ -667,7 +667,7 @@ void ConfigReaderThread::Finish()
 		User* user = ServerInstance->FindNick(TheUserUID);
 
 		ConfigStatus status(user);
-		const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
+		const ModuleManager::ModuleMap& mods = ServerInstance->Modules.GetModules();
 		for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
 		{
 			try
diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index d68c8b9fd..a04f01812 100644
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -56,7 +56,7 @@ CmdResult CommandModules::Handle(User* user, const Params& parameters)
 			return CMD_SUCCESS;
 	}
 
-	const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
+	const ModuleManager::ModuleMap& mods = ServerInstance->Modules.GetModules();
 
   	for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
 	{
diff --git a/src/coremods/core_loadmodule.cpp b/src/coremods/core_loadmodule.cpp
index 1728cb5ae..ce900bf80 100644
--- a/src/coremods/core_loadmodule.cpp
+++ b/src/coremods/core_loadmodule.cpp
@@ -40,7 +40,7 @@ class CommandLoadmodule : public Command
  */
 CmdResult CommandLoadmodule::Handle(User* user, const Params& parameters)
 {
-	if (ServerInstance->Modules->Load(parameters[0]))
+	if (ServerInstance->Modules.Load(parameters[0]))
 	{
 		ServerInstance->SNO->WriteGlobalSno('a', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str());
 		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
@@ -48,7 +48,7 @@ CmdResult CommandLoadmodule::Handle(User* user, const Params& parameters)
 	}
 	else
 	{
-		user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
+		user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules.LastError());
 		return CMD_FAILURE;
 	}
 }
@@ -86,21 +86,21 @@ CmdResult CommandUnloadmodule::Handle(User* user, const Params& parameters)
 		return CMD_FAILURE;
 	}
 
-	Module* m = ServerInstance->Modules->Find(parameters[0]);
+	Module* m = ServerInstance->Modules.Find(parameters[0]);
 	if (m == creator)
 	{
 		user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload module loading commands!");
 		return CMD_FAILURE;
 	}
 
-	if (m && ServerInstance->Modules->Unload(m))
+	if (m && ServerInstance->Modules.Unload(m))
 	{
 		ServerInstance->SNO->WriteGlobalSno('a', "MODULE UNLOADED: %s unloaded %s", user->nick.c_str(), parameters[0].c_str());
 		user->WriteNumeric(RPL_UNLOADEDMODULE, parameters[0], "Module successfully unloaded.");
 	}
 	else
 	{
-		user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], (m ? ServerInstance->Modules->LastError() : "No such module"));
+		user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], (m ? ServerInstance->Modules.LastError() : "No such module"));
 		return CMD_FAILURE;
 	}
 
diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index dbd75d642..53a2d247f 100644
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -719,14 +719,14 @@ class ReloadAction : public ActionBase
 
 		DLLManager* dll = mod->ModuleDLLManager;
 		std::string name = mod->ModuleSourceFile;
-		ServerInstance->Modules->DoSafeUnload(mod);
+		ServerInstance->Modules.DoSafeUnload(mod);
 		ServerInstance->GlobalCulls.Apply();
 		delete dll;
-		bool result = ServerInstance->Modules->Load(name);
+		bool result = ServerInstance->Modules.Load(name);
 
 		if (result)
 		{
-			Module* newmod = ServerInstance->Modules->Find(name);
+			Module* newmod = ServerInstance->Modules.Find(name);
 			datakeeper.Restore(newmod);
 		}
 		else
@@ -743,7 +743,7 @@ class ReloadAction : public ActionBase
 
 CmdResult CommandReloadmodule::Handle(User* user, const Params& parameters)
 {
-	Module* m = ServerInstance->Modules->Find(parameters[0]);
+	Module* m = ServerInstance->Modules.Find(parameters[0]);
 	if (m == creator)
 	{
 		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "You cannot reload core_reloadmodule (unload and load it)");
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index d94b4e3b7..3890a3f8f 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -103,7 +103,7 @@ void InspIRCd::Cleanup()
 	ports.clear();
 
 	GlobalCulls.Apply();
-	Modules->UnloadAll();
+	Modules.UnloadAll();
 
 	/* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
 	/* Must be deleted before modes as it decrements modelines */
@@ -438,7 +438,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	std::cout << std::endl;
 
-	this->Modules->LoadAll();
+	this->Modules.LoadAll();
 
 	// Build ISupport as ModuleManager::LoadAll() does not do it
 	this->ISupport.Build();
diff --git a/src/modules.cpp b/src/modules.cpp
index 1107d8e7d..56ddc5a11 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -71,7 +71,7 @@ Module::~Module()
 
 void Module::DetachEvent(Implementation i)
 {
-	ServerInstance->Modules->Detach(i, this);
+	ServerInstance->Modules.Detach(i, this);
 }
 
 void		Module::ReadConfig(ConfigStatus& status) { }
@@ -151,14 +151,14 @@ void		Module::OnRunTestSuite() { }
 ServiceProvider::ServiceProvider(Module* Creator, const std::string& Name, ServiceType Type)
 	: creator(Creator), name(Name), service(Type)
 {
-	if ((ServerInstance) && (ServerInstance->Modules->NewServices))
-		ServerInstance->Modules->NewServices->push_back(this);
+	if ((ServerInstance) && (ServerInstance->Modules.NewServices))
+		ServerInstance->Modules.NewServices->push_back(this);
 }
 
 void ServiceProvider::DisableAutoRegister()
 {
-	if ((ServerInstance) && (ServerInstance->Modules->NewServices))
-		stdalgo::erase(*ServerInstance->Modules->NewServices, this);
+	if ((ServerInstance) && (ServerInstance->Modules.NewServices))
+		stdalgo::erase(*ServerInstance->Modules.NewServices, this);
 }
 
 ModuleManager::ModuleManager()
@@ -449,7 +449,7 @@ namespace
 		void Call() override
 		{
 			DLLManager* dll = mod->ModuleDLLManager;
-			ServerInstance->Modules->DoSafeUnload(mod);
+			ServerInstance->Modules.DoSafeUnload(mod);
 			ServerInstance->GlobalCulls.Apply();
 			// In pure static mode this is always NULL
 			delete dll;
diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index e2c5fd1c5..17c336760 100644
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -544,7 +544,7 @@ class ModuleLDAP : public Module
 				LDAPService* conn = new LDAPService(this, tag);
 				conns[id] = conn;
 
-				ServerInstance->Modules->AddService(*conn);
+				ServerInstance->Modules.AddService(*conn);
 				ServerInstance->Threads.Start(conn);
 			}
 			else
@@ -557,7 +557,7 @@ class ModuleLDAP : public Module
 		for (ServiceMap::iterator i = LDAPServices.begin(); i != LDAPServices.end(); ++i)
 		{
 			LDAPService* conn = i->second;
-			ServerInstance->Modules->DelService(*conn);
+			ServerInstance->Modules.DelService(*conn);
 			conn->join();
 			conn->OnNotify();
 			delete conn;
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 4d2a206dc..a6fbb667b 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -428,7 +428,7 @@ void ModuleSQL::ReadConfig(ConfigStatus& status)
 		{
 			SQLConnection* conn = new SQLConnection(this, i->second);
 			conns.insert(std::make_pair(id, conn));
-			ServerInstance->Modules->AddService(*conn);
+			ServerInstance->Modules.AddService(*conn);
 		}
 		else
 		{
@@ -442,7 +442,7 @@ void ModuleSQL::ReadConfig(ConfigStatus& status)
 	SQL::Error err(SQL::BAD_DBID);
 	for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
 	{
-		ServerInstance->Modules->DelService(*i->second);
+		ServerInstance->Modules.DelService(*i->second);
 		// it might be running a query on this database. Wait for that to complete
 		i->second->lock.Lock();
 		i->second->lock.Unlock();
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index db9c8ac09..8fe81bc03 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -187,7 +187,7 @@ class SQLConn : public SQL::Provider, public EventHandler
 	CullResult cull() override
 	{
 		this->SQL::Provider::cull();
-		ServerInstance->Modules->DelService(*this);
+		ServerInstance->Modules.DelService(*this);
 		return this->EventHandler::cull();
 	}
 
@@ -554,7 +554,7 @@ class ModulePgSQL : public Module
 			{
 				SQLConn* conn = new SQLConn(this, i->second);
 				conns.insert(std::make_pair(id, conn));
-				ServerInstance->Modules->AddService(*conn);
+				ServerInstance->Modules.AddService(*conn);
 			}
 			else
 			{
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index f1a3ddb21..5aef19308 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -235,7 +235,7 @@ class ModuleSQLite3 : public Module
 		for(ConnMap::iterator i = conns.begin(); i != conns.end(); i++)
 		{
 			SQLConn* conn = i->second;
-			ServerInstance->Modules->DelService(*conn);
+			ServerInstance->Modules.DelService(*conn);
 			delete conn;
 		}
 		conns.clear();
@@ -251,7 +251,7 @@ class ModuleSQLite3 : public Module
 				continue;
 			SQLConn* conn = new SQLConn(this, i->second);
 			conns.insert(std::make_pair(i->second->getString("id"), conn));
-			ServerInstance->Modules->AddService(*conn);
+			ServerInstance->Modules.AddService(*conn);
 		}
 	}
 
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 2f7569d70..77f2fb377 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -1223,12 +1223,12 @@ class GnuTLSIOHookProvider : public IOHookProvider
 		: IOHookProvider(mod, "ssl/" + config.name, IOHookProvider::IOH_SSL)
 		, profile(config)
 	{
-		ServerInstance->Modules->AddService(*this);
+		ServerInstance->Modules.AddService(*this);
 	}
 
 	~GnuTLSIOHookProvider()
 	{
-		ServerInstance->Modules->DelService(*this);
+		ServerInstance->Modules.DelService(*this);
 	}
 
 	void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index fbefbab07..22f775f29 100644
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -812,12 +812,12 @@ class mbedTLSIOHookProvider : public IOHookProvider
 		: IOHookProvider(mod, "ssl/" + config.name, IOHookProvider::IOH_SSL)
 		, profile(config)
 	{
-		ServerInstance->Modules->AddService(*this);
+		ServerInstance->Modules.AddService(*this);
 	}
 
 	~mbedTLSIOHookProvider()
 	{
-		ServerInstance->Modules->DelService(*this);
+		ServerInstance->Modules.DelService(*this);
 	}
 
 	void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 5018cff86..538ac7ff4 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -894,12 +894,12 @@ class OpenSSLIOHookProvider : public IOHookProvider
 		: IOHookProvider(mod, "ssl/" + profilename, IOHookProvider::IOH_SSL)
 		, profile(profilename, tag)
 	{
-		ServerInstance->Modules->AddService(*this);
+		ServerInstance->Modules.AddService(*this);
 	}
 
 	~OpenSSLIOHookProvider()
 	{
-		ServerInstance->Modules->DelService(*this);
+		ServerInstance->Modules.DelService(*this);
 	}
 
 	void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override
diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index 4745a68af..c0db85090 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -30,7 +30,7 @@ class ModuleAbbreviation : public Module
  public:
 	void Prioritize() override
 	{
-		ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST);
+		ServerInstance->Modules.SetPriority(this, I_OnPreCommand, PRIORITY_FIRST);
 	}
 
 	Version GetVersion() override
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 99f362522..1f9d008cd 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -381,8 +381,8 @@ class ModuleAlias : public Module
 	void Prioritize() override
 	{
 		// Prioritise after spanningtree so that channel aliases show the alias before the effects.
-		Module* linkmod = ServerInstance->Modules->Find("m_spanningtree.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserPostMessage, PRIORITY_AFTER, linkmod);
+		Module* linkmod = ServerInstance->Modules.Find("m_spanningtree.so");
+		ServerInstance->Modules.SetPriority(this, I_OnUserPostMessage, PRIORITY_AFTER, linkmod);
 	}
 };
 
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 0a1b64c48..4ee2a4492 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -449,7 +449,7 @@ public:
 	void Prioritize() override
 	{
 		// Want to be after modules like silence or services_account
-		ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
+		ServerInstance->Modules.SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
 	}
 };
 
diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp
index 41c681cf5..99b55fb85 100644
--- a/src/modules/m_clearchan.cpp
+++ b/src/modules/m_clearchan.cpp
@@ -89,7 +89,7 @@ class CommandClearChan : public Command
 
 		// Attach to the appropriate hook so we're able to hide the QUIT/KICK messages
 		Implementation hook = (kick ? I_OnUserKick : I_OnBuildNeighborList);
-		ServerInstance->Modules->Attach(hook, creator);
+		ServerInstance->Modules.Attach(hook, creator);
 
 		std::string mask;
 		// Now remove all local non-opers from the channel
@@ -132,7 +132,7 @@ class CommandClearChan : public Command
 			ServerInstance->Users->QuitUser(curr, reason);
 		}
 
-		ServerInstance->Modules->Detach(hook, creator);
+		ServerInstance->Modules.Detach(hook, creator);
 		if (xlf)
 			ServerInstance->XLines->ApplyLines();
 
@@ -153,7 +153,7 @@ class ModuleClearChan : public Module
 	void init() override
 	{
 		// Only attached while we are working; don't react to events otherwise
-		ServerInstance->Modules->DetachAll(this);
+		ServerInstance->Modules.DetachAll(this);
 	}
 
 	void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) override
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 01bdce2ca..83c190f4c 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -357,7 +357,7 @@ class ModuleCloaking : public Module
 	void Prioritize() override
 	{
 		/* Needs to be after m_banexception etc. */
-		ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
+		ServerInstance->Modules.SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
 	}
 
 	// this unsets umode +x on every host change. If we are actually doing a +x
diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 585d71925..3769e9635 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -80,7 +80,7 @@ class ModuleConnJoin : public Module
 
 	void Prioritize() override
 	{
-		ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
+		ServerInstance->Modules.SetPriority(this, I_OnPostConnect, PRIORITY_LAST);
 	}
 
 	Version GetVersion() override
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 7e53a7a2f..f18a9e80b 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -28,7 +28,7 @@ class ModuleModesOnConnect : public Module
 	void Prioritize() override
 	{
 		// for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t
-		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
+		ServerInstance->Modules.SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
 	}
 
 	Version GetVersion() override
diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp
index a092372b2..29e64bbb1 100644
--- a/src/modules/m_customprefix.cpp
+++ b/src/modules/m_customprefix.cpp
@@ -87,7 +87,7 @@ class ModuleCustomPrefix : public Module
 			{
 				CustomPrefixMode* mh = new CustomPrefixMode(this, name, letter[0], prefix[0], tag);
 				modes.push_back(mh);
-				ServerInstance->Modules->AddService(*mh);
+				ServerInstance->Modules.AddService(*mh);
 			}
 			catch (ModuleException& e)
 			{
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 2ed428611..29dd834e5 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -41,14 +41,14 @@ class CommandGloadmodule : public Command
 
 		if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
 		{
-			if (ServerInstance->Modules->Load(parameters[0].c_str()))
+			if (ServerInstance->Modules.Load(parameters[0].c_str()))
 			{
 				ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
 				user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
 			}
 			else
 			{
-				user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
+				user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules.LastError());
 			}
 		}
 		else
@@ -87,17 +87,17 @@ class CommandGunloadmodule : public Command
 
 		if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
 		{
-			Module* m = ServerInstance->Modules->Find(parameters[0]);
+			Module* m = ServerInstance->Modules.Find(parameters[0]);
 			if (m)
 			{
-				if (ServerInstance->Modules->Unload(m))
+				if (ServerInstance->Modules.Unload(m))
 				{
 					ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
 					user->WriteRemoteNumeric(RPL_UNLOADEDMODULE, parameters[0], "Module successfully unloaded.");
 				}
 				else
 				{
-					user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
+					user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules.LastError());
 				}
 			}
 			else
@@ -131,7 +131,7 @@ class CommandGreloadmodule : public Command
 
 		if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
 		{
-			Module* m = ServerInstance->Modules->Find(parameters[0]);
+			Module* m = ServerInstance->Modules.Find(parameters[0]);
 			if (m)
 			{
 				ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'", parameters[0].c_str(), user->nick.c_str());
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 61a7aaac6..c67c1ac1b 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -154,7 +154,7 @@ namespace Stats
 	std::ostream& Modules(std::ostream& data)
 	{
 		data << "<modulelist>";
-		const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
+		const ModuleManager::ModuleMap& mods = ServerInstance->Modules.GetModules();
 
 		for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
 		{
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 67aef2324..1b31d12da 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -160,7 +160,7 @@ class ModuleMsgFlood : public Module
 	void Prioritize() override
 	{
 		// we want to be after all modules that might deny the message (e.g. m_muteban, m_noctcp, m_blockcolor, etc.)
-		ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
+		ServerInstance->Modules.SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
 	}
 
 	Version GetVersion() override
diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 570a620cb..c99ff9133 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -133,7 +133,7 @@ class ModuleNamedModes : public Module
 
 	void Prioritize() override
 	{
-		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
+		ServerInstance->Modules.SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
 	}
 
 	ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) override
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index f4ea299d3..fd12eb903 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -167,8 +167,8 @@ class ModuleNickLock : public Module
 
 	void Prioritize() override
 	{
-		Module *nflood = ServerInstance->Modules->Find("m_nickflood.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, nflood);
+		Module *nflood = ServerInstance->Modules.Find("m_nickflood.so");
+		ServerInstance->Modules.SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, nflood);
 	}
 };
 
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 0da8850d0..2437616de 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -152,7 +152,7 @@ class ModuleOjoin : public Module
 
 	void Prioritize() override
 	{
-		ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_FIRST);
+		ServerInstance->Modules.SetPriority(this, I_OnUserPreJoin, PRIORITY_FIRST);
 	}
 
 	Version GetVersion() override
diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 622c48db9..4ecbc84fb 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -107,8 +107,8 @@ class ModuleOperPrefixMode : public Module
 	void Prioritize() override
 	{
 		// m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case
-		Module* opermodes = ServerInstance->Modules->Find("m_opermodes.so");
-		ServerInstance->Modules->SetPriority(this, I_OnPostOper, PRIORITY_AFTER, opermodes);
+		Module* opermodes = ServerInstance->Modules.Find("m_opermodes.so");
+		ServerInstance->Modules.SetPriority(this, I_OnPostOper, PRIORITY_AFTER, opermodes);
 	}
 };
 
diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 01eb6b256..f0a12019b 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -37,7 +37,7 @@ class CommandMkpasswd : public Command
 		if (!parameters[0].compare(0, 5, "hmac-", 5))
 		{
 			std::string type(parameters[0], 5);
-			HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + type);
+			HashProvider* hp = ServerInstance->Modules.FindDataService<HashProvider>("hash/" + type);
 			if (!hp)
 			{
 				user->WriteNotice("Unknown hash type");
@@ -58,7 +58,7 @@ class CommandMkpasswd : public Command
 			return CMD_SUCCESS;
 		}
 
-		HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + parameters[0]);
+		HashProvider* hp = ServerInstance->Modules.FindDataService<HashProvider>("hash/" + parameters[0]);
 		if (!hp)
 		{
 			user->WriteNotice("Unknown hash type");
@@ -87,7 +87,7 @@ class ModulePasswordHash : public Module
 		if (!hashtype.compare(0, 5, "hmac-", 5))
 		{
 			std::string type(hashtype, 5);
-			HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + type);
+			HashProvider* hp = ServerInstance->Modules.FindDataService<HashProvider>("hash/" + type);
 			if (!hp)
 				return MOD_RES_PASSTHRU;
 
@@ -110,7 +110,7 @@ class ModulePasswordHash : public Module
 				return MOD_RES_DENY;
 		}
 
-		HashProvider* hp = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + hashtype);
+		HashProvider* hp = ServerInstance->Modules.FindDataService<HashProvider>("hash/" + hashtype);
 
 		/* Is this a valid hash name? */
 		if (hp)
diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp
index 3b2c3052a..20c3ddd12 100644
--- a/src/modules/m_pbkdf2.cpp
+++ b/src/modules/m_pbkdf2.cpp
@@ -231,7 +231,7 @@ class ModulePBKDF2 : public Module
 			if (item->provider != &prov)
 				continue;
 
-			ServerInstance->Modules->DelService(*item);
+			ServerInstance->Modules.DelService(*item);
 			delete item;
 			providers.erase(i);
 			break;
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 8e2c62230..0c93075f5 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -407,7 +407,7 @@ class RepeatModule : public Module
 
 	void Prioritize() override
 	{
-		ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
+		ServerInstance->Modules.SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
 	}
 
 	Version GetVersion() override
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 248b3ec0d..5151f8ace 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -347,8 +347,8 @@ class ModuleRLine : public Module, public Stats::EventListener
 
 	void Prioritize() override
 	{
-		Module* mod = ServerInstance->Modules->Find("m_cgiirc.so");
-		ServerInstance->Modules->SetPriority(this, I_OnUserRegister, PRIORITY_AFTER, mod);
+		Module* mod = ServerInstance->Modules.Find("m_cgiirc.so");
+		ServerInstance->Modules.SetPriority(this, I_OnUserRegister, PRIORITY_AFTER, mod);
 	}
 };
 
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 37d11de18..4d8c4bf84 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -124,11 +124,11 @@ class ModuleSaMode : public Module
 
 	void Prioritize() override
 	{
-		Module* disable = ServerInstance->Modules->Find("m_disable.so");
-		ServerInstance->Modules->SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable);
+		Module* disable = ServerInstance->Modules.Find("m_disable.so");
+		ServerInstance->Modules.SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable);
 
-		Module *override = ServerInstance->Modules->Find("m_override.so");
-		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
+		Module *override = ServerInstance->Modules.Find("m_override.so");
+		ServerInstance->Modules.SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
 	}
 };
 
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index e3937dfbc..c235d80c6 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -410,7 +410,7 @@ class ModuleSASL : public Module
 
 	void init() override
 	{
-		if (!ServerInstance->Modules->Find("m_services_account.so") || !ServerInstance->Modules->Find("m_cap.so"))
+		if (!ServerInstance->Modules.Find("m_services_account.so") || !ServerInstance->Modules.Find("m_cap.so"))
 			ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "WARNING: m_services_account and m_cap are not loaded! m_sasl will NOT function correctly until these two modules are loaded!");
 	}
 
diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 67bbda390..93b80783b 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -131,7 +131,7 @@ class ModuleShowFile : public Module
 		{
 			// Command doesn't exist, create it
 			sfcmd = new CommandShowFile(this, cmdname);
-			ServerInstance->Modules->AddService(*sfcmd);
+			ServerInstance->Modules.AddService(*sfcmd);
 		}
 
 		sfcmd->UpdateSettings(tag, reader.GetVector());
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index f3117392f..1e2ee7ff1 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -168,8 +168,8 @@ class ModuleShun : public Module, public Stats::EventListener
 
 	void Prioritize() override
 	{
-		Module* alias = ServerInstance->Modules->Find("m_alias.so");
-		ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, alias);
+		Module* alias = ServerInstance->Modules.Find("m_alias.so");
+		ServerInstance->Modules.SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, alias);
 	}
 
 	ModResult OnStats(Stats::Context& stats) override
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 38958f0fb..93e8008a6 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -39,7 +39,7 @@ static CompatMod compatmods[] =
 
 std::string TreeSocket::MyModules(int filter)
 {
-	const ModuleManager::ModuleMap& modlist = ServerInstance->Modules->GetModules();
+	const ModuleManager::ModuleMap& modlist = ServerInstance->Modules.GetModules();
 
 	std::string capabilities;
 	for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
@@ -170,7 +170,7 @@ void TreeSocket::SendCapabilities(int phase)
 
 	std::string extra;
 	/* Do we have sha256 available? If so, we send a challenge */
-	if (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256"))
+	if (ServerInstance->Modules.FindService(SERVICE_DATA, "hash/sha256"))
 	{
 		SetOurChallenge(ServerInstance->GenRandomStr(20));
 		extra = " CHALLENGE=" + this->GetOurChallenge();
@@ -204,7 +204,7 @@ void TreeSocket::SendCapabilities(int phase)
 			// in 2.0, we advertise it here to not break linking to previous versions.
 			// Protocol version 1201 (1.2) does not have this issue because we advertise m_globops
 			// to 1201 protocol servers irrespectively of its module flags.
-			(ServerInstance->Modules->Find("m_globops.so") != NULL ? " GLOBOPS=1" : " GLOBOPS=0")
+			(ServerInstance->Modules.Find("m_globops.so") != NULL ? " GLOBOPS=1" : " GLOBOPS=0")
 			);
 
 	this->WriteLine("CAPAB END");
@@ -395,7 +395,7 @@ bool TreeSocket::Capab(const CommandBase::Params& params)
 
 		/* Challenge response, store their challenge for our password */
 		std::map<std::string,std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE");
-		if ((n != this->capab->CapKeys.end()) && (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256")))
+		if ((n != this->capab->CapKeys.end()) && (ServerInstance->Modules.FindService(SERVICE_DATA, "hash/sha256")))
 		{
 			/* Challenge-response is on now */
 			this->SetTheirChallenge(n->second);
diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index 0343f9611..8fcb47655 100644
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -54,7 +54,7 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
 	 * Note: If an sha256 provider is not available, we MUST fall back to plaintext with no
 	 *       HMAC challenge/response.
 	 */
-	HashProvider* sha256 = ServerInstance->Modules->FindDataService<HashProvider>("hash/sha256");
+	HashProvider* sha256 = ServerInstance->Modules.FindDataService<HashProvider>("hash/sha256");
 	if (sha256 && !challenge.empty())
 		return "AUTH:" + BinToBase64(sha256->hmac(password, challenge));
 
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index a66dad133..600b92b02 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -793,7 +793,7 @@ Version ModuleSpanningTree::GetVersion()
  */
 void ModuleSpanningTree::Prioritize()
 {
-	ServerInstance->Modules->SetPriority(this, PRIORITY_LAST);
+	ServerInstance->Modules.SetPriority(this, PRIORITY_LAST);
 	ServerInstance->Modules.SetPriority(this, I_OnPreTopicChange, PRIORITY_FIRST);
 }
 
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 118be622b..d98e74410 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -114,7 +114,7 @@ void TreeSocket::OnConnected()
 	{
 		if (!capab->link->Hook.empty())
 		{
-			ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, capab->link->Hook);
+			ServiceProvider* prov = ServerInstance->Modules.FindService(SERVICE_IOHOOK, capab->link->Hook);
 			if (!prov)
 			{
 				SetError("Could not find hook '" + capab->link->Hook + "' for connection to " + linkID);
diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index 016a9d918..c3dee7130 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -57,7 +57,7 @@ class AuthQuery : public SQL::Query
 		{
 			if (!kdf.empty())
 			{
-				HashProvider* hashprov = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + kdf);
+				HashProvider* hashprov = ServerInstance->Modules.FindDataService<HashProvider>("hash/" + kdf);
 				if (!hashprov)
 				{
 					if (verbose)
@@ -185,7 +185,7 @@ class ModuleSQLAuth : public Module
 
 		for (std::vector<std::string>::const_iterator it = hash_algos.begin(); it != hash_algos.end(); ++it)
 		{
-			HashProvider* hashprov = ServerInstance->Modules->FindDataService<HashProvider>("hash/" + *it);
+			HashProvider* hashprov = ServerInstance->Modules.FindDataService<HashProvider>("hash/" + *it);
 			if (hashprov && !hashprov->IsKDF())
 				userinfo[*it + "pass"] = hashprov->Generate(user->password);
 		}
diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index a7a9ec99b..b822b1db2 100644
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -76,7 +76,7 @@ TestSuite::TestSuite()
 		{
 			case '1':
 			{
-				const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
+				const ModuleManager::ModuleMap& mods = ServerInstance->Modules.GetModules();
 				for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
 					i->second->OnRunTestSuite();
 				break;
@@ -84,14 +84,14 @@ TestSuite::TestSuite()
 			case '2':
 				std::cout << "Enter module filename to load: ";
 				std::cin >> modname;
-				std::cout << (ServerInstance->Modules->Load(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+				std::cout << (ServerInstance->Modules.Load(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
 				break;
 			case '3':
 				std::cout << "Enter module filename to unload: ";
 				std::cin >> modname;
 				{
-					Module* m = ServerInstance->Modules->Find(modname);
-					std::cout << (ServerInstance->Modules->Unload(m) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+					Module* m = ServerInstance->Modules.Find(modname);
+					std::cout << (ServerInstance->Modules.Unload(m) ? "\nSUCCESS!\n" : "\nFAILURE\n");
 					ServerInstance->AtomicActions.Run();
 				}
 				break;