Index: binary-improvements/MapRendering/Web/API/ExecuteConsoleCommand.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/ExecuteConsoleCommand.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/API/ExecuteConsoleCommand.cs	(revision 420)
@@ -31,5 +31,5 @@
 			}
 
-			int commandPermissionLevel = GameManager.Instance.adminTools.GetCommandPermissionLevel (command.GetCommands ());
+			int commandPermissionLevel = GameManager.Instance.adminTools.Commands.GetCommandPermissionLevel (command.GetCommands ());
 
 			if (_permissionLevel > commandPermissionLevel) {
Index: binary-improvements/MapRendering/Web/API/GetAllowedCommands.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetAllowedCommands.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/API/GetAllowedCommands.cs	(revision 420)
@@ -9,5 +9,5 @@
 			JSONArray entries = new JSONArray ();
 			foreach (IConsoleCommand cc in SdtdConsole.Instance.GetCommands ()) {
-				int commandPermissionLevel = GameManager.Instance.adminTools.GetCommandPermissionLevel (cc.GetCommands ());
+				int commandPermissionLevel = GameManager.Instance.adminTools.Commands.GetCommandPermissionLevel (cc.GetCommands ());
 				if (_permissionLevel <= commandPermissionLevel) {
 					string cmd = string.Empty;
Index: binary-improvements/MapRendering/Web/API/GetLandClaims.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetLandClaims.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/API/GetLandClaims.cs	(revision 420)
@@ -23,5 +23,5 @@
 
 			JSONObject result = new JSONObject ();
-			result.Add ("claimsize", new JSONNumber (GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> ("LandClaimSize"))));
+			result.Add ("claimsize", new JSONNumber (GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> (nameof(EnumGamePrefs.LandClaimSize)))));
 
 			JSONArray claimOwners = new JSONArray ();
Index: binary-improvements/MapRendering/Web/API/GetPlayerList.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetPlayerList.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/API/GetPlayerList.cs	(revision 420)
@@ -68,5 +68,5 @@
 					pJson.Add ("ping", new JSONNumber (p.IsOnline ? p.ClientInfo.ping : -1));
 
-					JSONBoolean banned = admTools != null ? new JSONBoolean (admTools.IsBanned (kvp.Key, out _, out _)) : new JSONBoolean (false);
+					JSONBoolean banned = admTools != null ? new JSONBoolean (admTools.Blacklist.IsBanned (kvp.Key, out _, out _)) : new JSONBoolean (false);
 
 					pJson.Add ("banned", banned);
Index: binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs	(revision 420)
@@ -24,5 +24,5 @@
 			foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in playersList.Dict) {
 				if (admTools != null) {
-					if (admTools.IsBanned (kvp.Key, out _, out _)) {
+					if (admTools.Blacklist.IsBanned (kvp.Key, out _, out _)) {
 						continue;
 					}
Index: binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs
===================================================================
--- binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs	(revision 420)
@@ -89,5 +89,5 @@
 						loadIconsFromFolder (modIconsPath, tintedIcons);
 					} catch (Exception e) {
-						Log.Error ("Failed loading icons from mod " + mod.ModInfo.Name.Value);
+						Log.Error ("Failed loading icons from mod " + mod.Name);
 						Log.Exception (e);
 					}
Index: binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs
===================================================================
--- binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs	(revision 420)
@@ -1,5 +1,5 @@
 using System.IO;
 using System.Net;
-using AllocsFixes.FileCache;
+using Webserver.FileCache;
 
 namespace AllocsFixes.NetConnections.Servers.Web.Handlers {
Index: binary-improvements/MapRendering/Web/OpenID.cs
===================================================================
--- binary-improvements/MapRendering/Web/OpenID.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/OpenID.cs	(revision 420)
@@ -26,13 +26,7 @@
 
 		private const bool verboseSsl = false;
-		public static bool debugOpenId;
+		private static bool debugOpenId => Webserver.OpenID.debugOpenId;
 
 		static OpenID () {
-			for (int i = 0; i < Environment.GetCommandLineArgs ().Length; i++) {
-				if (Environment.GetCommandLineArgs () [i].EqualsCaseInsensitive ("-debugopenid")) {
-					debugOpenId = true;
-				}
-			}
-
 			ServicePointManager.ServerCertificateValidationCallback = (_srvPoint, _certificate, _chain, _errors) => {
 				if (_errors == SslPolicyErrors.None) {
Index: binary-improvements/MapRendering/Web/Web.cs
===================================================================
--- binary-improvements/MapRendering/Web/Web.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/Web.cs	(revision 420)
@@ -7,8 +7,8 @@
 using System.Text;
 using System.Threading;
-using AllocsFixes.FileCache;
 using AllocsFixes.NetConnections.Servers.Web.Handlers;
 using AllocsFixes.NetConnections.Servers.Web.SSE;
 using UnityEngine;
+using Webserver.FileCache;
 
 namespace AllocsFixes.NetConnections.Servers.Web {
@@ -25,13 +25,13 @@
 		public Web () {
 			try {
-				int webPort = GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> ("ControlPanelPort"));
+				int webPort = GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> (nameof(EnumGamePrefs.WebDashboardPort)));
 				if (webPort < 1 || webPort > 65533) {
-					Log.Out ("Webserver not started (ControlPanelPort not within 1-65533)");
+					Log.Out ("Webserver not started (WebDashboardPort not within 1-65533)");
 					return;
 				}
 
 				if (!Directory.Exists (Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) +
-				                       "/webserver")) {
-					Log.Out ("Webserver not started (folder \"webserver\" not found in WebInterface mod folder)");
+				                       "/webserver_legacy")) {
+					Log.Out ("Webserver not started (folder \"webserver_legacy\" not found in WebInterface mod folder)");
 					return;
 				}
@@ -40,5 +40,5 @@
 				bool useStaticCache = false;
 
-				string dataFolder = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) + "/webserver";
+				string dataFolder = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) + "/webserver_legacy";
 
 				if (!HttpListener.IsSupported) {
@@ -60,5 +60,5 @@
 				RegisterPathHandler ("/map/", new StaticHandler (
 						GameIO.GetSaveGameDir () + "/map",
-						MapRendering.MapRendering.GetTileCache (),
+						MapRendering.MapRenderer.GetTileCache (),
 						false,
 						"web.map")
@@ -248,5 +248,5 @@
 				if (con != null) {
 					_con = con;
-					return GameManager.Instance.adminTools.GetUserPermissionLevel (_con.UserId);
+					return GameManager.Instance.adminTools.Users.GetUserPermissionLevel (_con.UserId);
 				}
 			}
@@ -270,5 +270,5 @@
 						WebConnection con = connectionHandler.LogIn (id, _req.RemoteEndPoint.Address);
 						_con = con;
-						int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
+						int level = GameManager.Instance.adminTools.Users.GetUserPermissionLevel (con.UserId);
 						Log.Out ("Steam OpenID login from {0} with ID {1}, permission level {2}",
 							remoteEndpointString, con.UserId, level);
Index: binary-improvements/MapRendering/Web/WebPermissions.cs
===================================================================
--- binary-improvements/MapRendering/Web/WebPermissions.cs	(revision 372)
+++ binary-improvements/MapRendering/Web/WebPermissions.cs	(revision 420)
@@ -171,5 +171,5 @@
 
 		private string GetFilePath () {
-			return GamePrefs.GetString (EnumUtils.Parse<EnumGamePrefs> ("SaveGameFolder"));
+			return GamePrefs.GetString (EnumUtils.Parse<EnumGamePrefs> (nameof(EnumGamePrefs.SaveGameFolder)));
 		}