Started refactoring WebServer

Plan/src/main/java/com/djrapitops/plan/Plan.java

@@ -24,16 +24,21 @@ import com.djrapitops.plan.api.exceptions.EnableException;
 import com.djrapitops.plan.command.PlanCommand;
 import com.djrapitops.plan.data.plugin.HookHandler;
 import com.djrapitops.plan.database.Database;
-import com.djrapitops.plan.system.settings.Settings;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.Msg;
 import com.djrapitops.plan.settings.theme.PlanColorScheme;
 import com.djrapitops.plan.settings.theme.Theme;
+import com.djrapitops.plan.system.file.FileSystem;
+import com.djrapitops.plan.system.processing.ProcessingQueue;
+import com.djrapitops.plan.system.settings.Settings;
+import com.djrapitops.plan.system.settings.config.ConfigSystem;
+import com.djrapitops.plan.system.update.VersionCheckSystem;
+import com.djrapitops.plan.system.webserver.WebServer;
+import com.djrapitops.plan.system.webserver.WebServerSystem;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
 import com.djrapitops.plan.systems.Systems;
 import com.djrapitops.plan.systems.cache.DataCache;
 import com.djrapitops.plan.systems.cache.GeolocationCache;
-import com.djrapitops.plan.system.file.FileSystem;
-import com.djrapitops.plan.system.settings.config.ConfigSystem;
 import com.djrapitops.plan.systems.file.database.DBSystem;
 import com.djrapitops.plan.systems.info.BukkitInformationManager;
 import com.djrapitops.plan.systems.info.ImporterManager;
@@ -42,12 +47,7 @@ import com.djrapitops.plan.systems.info.server.BukkitServerInfoManager;
 import com.djrapitops.plan.systems.listeners.*;
 import com.djrapitops.plan.systems.processing.Processor;
 import com.djrapitops.plan.systems.processing.importing.importers.OfflinePlayerImporter;
-import com.djrapitops.plan.system.processing.ProcessingQueue;
 import com.djrapitops.plan.systems.tasks.TaskSystem;
-import com.djrapitops.plan.system.update.VersionCheckSystem;
-import com.djrapitops.plan.systems.webserver.WebServer;
-import com.djrapitops.plan.systems.webserver.WebServerSystem;
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
 import com.djrapitops.plan.utilities.file.export.HtmlExport;
 import com.djrapitops.plan.utilities.metrics.BStats;
 import com.djrapitops.plugin.BukkitPlugin;

Plan/src/main/java/com/djrapitops/plan/PlanBungee.java

@@ -6,25 +6,25 @@ package com.djrapitops.plan;
 
 import com.djrapitops.plan.command.PlanBungeeCommand;
 import com.djrapitops.plan.database.Database;
-import com.djrapitops.plan.system.settings.Settings;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.Msg;
 import com.djrapitops.plan.settings.theme.PlanColorScheme;
 import com.djrapitops.plan.settings.theme.Theme;
-import com.djrapitops.plan.systems.Systems;
 import com.djrapitops.plan.system.file.FileSystem;
+import com.djrapitops.plan.system.processing.ProcessingQueue;
+import com.djrapitops.plan.system.settings.Settings;
 import com.djrapitops.plan.system.settings.config.ConfigSystem;
+import com.djrapitops.plan.system.update.VersionCheckSystem;
+import com.djrapitops.plan.system.webserver.WebServer;
+import com.djrapitops.plan.system.webserver.WebServerSystem;
+import com.djrapitops.plan.systems.Systems;
 import com.djrapitops.plan.systems.file.database.DBSystem;
 import com.djrapitops.plan.systems.info.BungeeInformationManager;
 import com.djrapitops.plan.systems.info.InformationManager;
 import com.djrapitops.plan.systems.info.server.BungeeServerInfoManager;
 import com.djrapitops.plan.systems.listeners.BungeePlayerListener;
 import com.djrapitops.plan.systems.processing.Processor;
-import com.djrapitops.plan.system.processing.ProcessingQueue;
 import com.djrapitops.plan.systems.tasks.TaskSystem;
-import com.djrapitops.plan.system.update.VersionCheckSystem;
-import com.djrapitops.plan.systems.webserver.WebServer;
-import com.djrapitops.plan.systems.webserver.WebServerSystem;
 import com.djrapitops.plan.utilities.file.export.HtmlExport;
 import com.djrapitops.plugin.BungeePlugin;
 import com.djrapitops.plugin.StaticHolder;

Plan/src/main/java/com/djrapitops/plan/PlanPlugin.java

@@ -6,10 +6,10 @@ package com.djrapitops.plan;
 
 import com.djrapitops.plan.database.Database;
 import com.djrapitops.plan.system.processing.ProcessingQueue;
+import com.djrapitops.plan.system.webserver.WebServer;
 import com.djrapitops.plan.systems.Systems;
 import com.djrapitops.plan.systems.info.InformationManager;
 import com.djrapitops.plan.systems.processing.Processor;
-import com.djrapitops.plan.systems.webserver.WebServer;
 import com.djrapitops.plugin.IPlugin;
 import com.djrapitops.plugin.api.Check;
 import com.djrapitops.plugin.api.config.Config;
@@ -25,6 +25,7 @@ import java.util.UUID;
  * @author Rsl1122
  */
 public interface PlanPlugin extends IPlugin {
+    @Deprecated
     Database getDB();
 
     ServerVariableHolder getVariable();

Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java

@@ -8,8 +8,8 @@ import com.djrapitops.plan.Plan;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.Msg;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.InspectWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.InspectWebAPI;
 import com.djrapitops.plan.utilities.Condition;
 import com.djrapitops.plugin.command.CommandType;
 import com.djrapitops.plugin.command.ISender;

Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java

@@ -3,11 +3,11 @@ package com.djrapitops.plan.command.commands.manage;
 import com.djrapitops.plan.Plan;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
 import com.djrapitops.plan.api.exceptions.WebAPIForbiddenException;
-import com.djrapitops.plan.system.settings.Permissions;
-import com.djrapitops.plan.system.settings.Settings;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.Msg;
-import com.djrapitops.plan.systems.webserver.webapi.bungee.RequestSetupWebAPI;
+import com.djrapitops.plan.system.settings.Permissions;
+import com.djrapitops.plan.system.settings.Settings;
+import com.djrapitops.plan.system.webserver.webapi.bungee.RequestSetupWebAPI;
 import com.djrapitops.plan.utilities.Condition;
 import com.djrapitops.plugin.api.config.Config;
 import com.djrapitops.plugin.api.utility.log.Log;

Plan/src/main/java/com/djrapitops/plan/system/webserver/APIRequestHandler.java

@@ -2,11 +2,11 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver;
+package com.djrapitops.plan.system.webserver;
 
 import com.djrapitops.plan.system.settings.Settings;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager;
+import com.djrapitops.plan.system.webserver.webapi.WebAPIManager;
 import com.djrapitops.plugin.api.Benchmark;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.sun.net.httpserver.Headers;

Plan/src/main/java/com/djrapitops/plan/system/webserver/APIResponseHandler.java

@@ -2,15 +2,14 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver;
+package com.djrapitops.plan.system.webserver;
 
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageId;
+import com.djrapitops.plan.system.webserver.pagecache.PageId;
-import com.djrapitops.plan.systems.webserver.response.*;
+import com.djrapitops.plan.system.webserver.response.*;
-import com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse;
+import com.djrapitops.plan.system.webserver.response.api.BadRequestResponse;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager;
+import com.djrapitops.plan.system.webserver.webapi.WebAPIManager;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plan.utilities.html.Html;
 import com.djrapitops.plugin.api.utility.log.Log;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/Request.java

@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver;
+package com.djrapitops.plan.system.webserver;
 
 import com.djrapitops.plugin.utilities.Verify;
 import com.sun.net.httpserver.Headers;

Plan/src/main/java/com/djrapitops/plan/system/webserver/RequestHandler.java

@@ -2,12 +2,11 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver;
+package com.djrapitops.plan.system.webserver;
 
-import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.system.settings.Settings;
-import com.djrapitops.plan.systems.webserver.response.PromptAuthorizationResponse;
+import com.djrapitops.plan.system.webserver.response.PromptAuthorizationResponse;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
 import com.djrapitops.plugin.api.Benchmark;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.sun.net.httpserver.Headers;
@@ -25,8 +24,8 @@ public class RequestHandler implements HttpHandler {
 
     private final ResponseHandler responseHandler;
 
-    RequestHandler(PlanPlugin plugin, WebServer webServer) {
+    RequestHandler(WebServer webServer) {
-        responseHandler = new ResponseHandler(plugin, webServer);
+        responseHandler = new ResponseHandler(webServer);
     }
 
     @Override

Plan/src/main/java/com/djrapitops/plan/system/webserver/ResponseHandler.java

@@ -2,17 +2,16 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver;
+package com.djrapitops.plan.system.webserver;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.ParseException;
 import com.djrapitops.plan.api.exceptions.WebUserAuthException;
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.database.tables.SecurityTable;
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageId;
+import com.djrapitops.plan.system.webserver.pagecache.PageId;
-import com.djrapitops.plan.systems.webserver.response.*;
+import com.djrapitops.plan.system.webserver.response.*;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plan.utilities.PassEncryptUtil;
 import com.djrapitops.plan.utilities.uuid.UUIDUtility;
 import com.djrapitops.plugin.api.utility.log.Log;
@@ -29,13 +28,10 @@ import java.util.UUID;
  */
 public class ResponseHandler extends APIResponseHandler {
 
-    private final PlanPlugin plugin;
-
     private final boolean usingHttps;
 
-    public ResponseHandler(PlanPlugin plugin, WebServer webServer) {
+    public ResponseHandler(WebServer webServer) {
-        super(webServer.getWebAPI());
+        super();
-        this.plugin = plugin;
         this.usingHttps = webServer.isUsingHTTPS();
     }
 
@@ -90,7 +86,7 @@ public class ResponseHandler extends APIResponseHandler {
                 case "server":
                     if (args.length > 2) {
                         try {
-                            Optional<UUID> serverUUIDOptional = plugin.getDB().getServerTable().getServerUUID(args[2].replace("%20", " "));
+                            Optional<UUID> serverUUIDOptional = PlanPlugin.getInstance().getDB().getServerTable().getServerUUID(args[2].replace("%20", " "));
                             if (serverUUIDOptional.isPresent()) {
                                 serverUUID = serverUUIDOptional.get();
                             }
@@ -134,7 +130,7 @@ public class ResponseHandler extends APIResponseHandler {
         String user = userInfo[0];
         String passwordRaw = userInfo[1];
 
-        SecurityTable securityTable = plugin.getDB().getSecurityTable();
+        SecurityTable securityTable = PlanPlugin.getInstance().getDB().getSecurityTable();
         if (!securityTable.userExists(user)) {
             throw new WebUserAuthException("User Doesn't exist");
         }

Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java

@@ -1,13 +1,11 @@
-package com.djrapitops.plan.systems.webserver;
+package com.djrapitops.plan.system.webserver;
 
 import com.djrapitops.plan.PlanPlugin;
-import com.djrapitops.plan.system.settings.Settings;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.Msg;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager;
+import com.djrapitops.plan.system.SubSystem;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.*;
+import com.djrapitops.plan.system.file.FileSystem;
-import com.djrapitops.plan.systems.webserver.webapi.bungee.*;
+import com.djrapitops.plan.system.settings.Settings;
-import com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI;
 import com.djrapitops.plan.utilities.html.HtmlUtils;
 import com.djrapitops.plugin.StaticHolder;
 import com.djrapitops.plugin.api.Check;
@@ -34,51 +32,56 @@ import java.util.concurrent.TimeUnit;
 /**
  * @author Rsl1122
  */
-public class WebServer {
+public class WebServer implements SubSystem {
 
-    private final PlanPlugin plugin;
+    private int port;
-    private final WebAPIManager webAPI;
-
-    private final int port;
     private boolean enabled = false;
     private HttpServer server;
 
     private boolean usingHttps = false;
 
-    public WebServer(PlanPlugin plugin) {
+    @Override
-        this.plugin = plugin;
+    public void enable() {
         this.port = Settings.WEBSERVER_PORT.getNumber();
-        webAPI = new WebAPIManager();
-        registerWebAPIs();
 
+        PlanPlugin plugin = PlanPlugin.getInstance();
         StaticHolder.saveInstance(APIRequestHandler.class, plugin.getClass());
         StaticHolder.saveInstance(RequestHandler.class, plugin.getClass());
         StaticHolder.saveInstance(ResponseHandler.class, plugin.getClass());
         StaticHolder.saveInstance(APIResponseHandler.class, plugin.getClass());
+
+        initServer();
     }
 
-    private void registerWebAPIs() {
+    @Override
-        webAPI.registerNewAPI(
+    public void disable() {
-                new AnalysisReadyWebAPI(),
+        stop();
-                new AnalyzeWebAPI(),
-                new ConfigurationWebAPI(),
-                new InspectWebAPI(),
-                new IsOnlineWebAPI(),
-                new RequestInspectPluginsTabBukkitWebAPI(),
-                new PingWebAPI()
-        );
-
-        webAPI.registerNewAPI(
-                new IsCachedWebAPI(),
-                new PostHtmlWebAPI(),
-                new PostInspectPluginsTabWebAPI(),
-                new PostNetworkPageContentWebAPI(),
-                new PostOriginalBukkitSettingsWebAPI(),
-                new RequestPluginsTabWebAPI(),
-                new RequestSetupWebAPI()
-        );
     }
 
+    // TODO WebAPIPageHandler
+//    private void registerWebAPIs() {
+//        webAPI.registerNewAPI(
+//                new AnalysisReadyWebAPI(),
+//                new AnalyzeWebAPI(),
+//                new ConfigurationWebAPI(),
+//                new InspectWebAPI(),
+//                new IsOnlineWebAPI(),
+//                new RequestInspectPluginsTabBukkitWebAPI(),
+//                new PingWebAPI()
+//        );
+//
+//        webAPI.registerNewAPI(
+//                new IsCachedWebAPI(),
+//                new PostHtmlWebAPI(),
+//                new PostInspectPluginsTabWebAPI(),
+//                new PostNetworkPageContentWebAPI(),
+//                new PostOriginalBukkitSettingsWebAPI(),
+//                new RequestPluginsTabWebAPI(),
+//                new RequestSetupWebAPI()
+//        );
+//    }
+    //Log.infoColor("§aWebServer Running in WebAPI-only Mode");
+
     /**
      * Starts up the WebServer in a new Thread Pool.
      */
@@ -103,12 +106,8 @@ public class WebServer {
                 Log.infoColor("§eUser Authorization Disabled! (Not possible over http)");
                 server = HttpServer.create(new InetSocketAddress(Settings.WEBSERVER_IP.toString(), port), 10);
             }
-            if (plugin.getInfoManager().isUsingAnotherWebServer()) {
+
-                server.createContext("/", new APIRequestHandler(getWebAPI()));
+            server.createContext("/", new RequestHandler(this));
-                Log.infoColor("§aWebServer Running in WebAPI-only Mode");
-            } else {
-                server.createContext("/", new RequestHandler(plugin, this));
-            }
 
             server.setExecutor(new ThreadPoolExecutor(4, 8, 30, TimeUnit.SECONDS, new ArrayBlockingQueue<>(100)));
             server.start();
@@ -125,7 +124,7 @@ public class WebServer {
     private boolean startHttpsServer() {
         String keyStorePath = Settings.WEBSERVER_CERTIFICATE_PATH.toString();
         if (!Paths.get(keyStorePath).isAbsolute()) {
-            keyStorePath = plugin.getDataFolder() + File.separator + keyStorePath;
+            keyStorePath = FileSystem.getDataFolder() + File.separator + keyStorePath;
         }
 
         char[] storepass = Settings.WEBSERVER_CERTIFICATE_STOREPASS.toString().toCharArray();
@@ -214,8 +213,4 @@ public class WebServer {
     public String getAccessAddress() {
         return isEnabled() ? getProtocol() + "://" + HtmlUtils.getIP() : Settings.EXTERNAL_WEBSERVER_LINK.toString();
     }
-
-    public WebAPIManager getWebAPI() {
-        return webAPI;
-    }
 }

Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServerSystem.java

@@ -2,12 +2,11 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver;
+package com.djrapitops.plan.system.webserver;
 
 import com.djrapitops.plan.api.exceptions.EnableException;
 import com.djrapitops.plan.system.SubSystem;
 import com.djrapitops.plan.systems.Systems;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plugin.api.Check;
 
 /**

Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageCache.java

@@ -1,7 +1,7 @@
-package com.djrapitops.plan.systems.webserver.pagecache;
+package com.djrapitops.plan.system.webserver.pagecache;
 
-import com.djrapitops.plan.systems.webserver.response.InspectPageResponse;
+import com.djrapitops.plan.system.webserver.response.InspectPageResponse;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
 
 import java.util.HashMap;
 import java.util.Map;

Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageId.java

@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.pagecache;
+package com.djrapitops.plan.system.webserver.pagecache;
 
 import java.util.UUID;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageLoader.java

@@ -1,6 +1,6 @@
-package com.djrapitops.plan.systems.webserver.pagecache;
+package com.djrapitops.plan.system.webserver.pagecache;
 
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
 
 /**
  * This interface is used for providing the method to load the page.

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/AnalysisPageResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.Plan;
 import com.djrapitops.plan.data.AnalysisData;

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/CSSResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.settings.theme.Theme;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/DebugPageResponse.java

@@ -2,14 +2,13 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.PlanBungee;
-import com.djrapitops.plan.ServerVariableHolder;
 import com.djrapitops.plan.PlanPlugin;
+import com.djrapitops.plan.ServerVariableHolder;
 import com.djrapitops.plan.systems.info.server.BungeeServerInfoManager;
 import com.djrapitops.plan.systems.info.server.ServerInfo;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plan.utilities.file.FileUtil;
 import com.djrapitops.plan.utilities.html.Html;
 import com.djrapitops.plugin.api.Benchmark;

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ErrorResponse.java

@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.settings.theme.Theme;
 import com.djrapitops.plan.utilities.MiscUtils;

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/FileResponse.java

@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.utilities.file.FileUtil;
 import com.djrapitops.plugin.utilities.Verify;

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ForbiddenResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.utilities.html.Html;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/InspectPageResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.api.exceptions.ParseException;
 import com.djrapitops.plan.settings.theme.Theme;

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/InternalErrorResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.utilities.html.Html;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/JavaScriptResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.settings.theme.Theme;
 import com.djrapitops.plan.settings.theme.ThemeVal;

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/NotFoundResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.utilities.html.Html;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/PlayersPageResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.data.container.GeoInfo;
@@ -6,10 +6,9 @@ import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.container.UserInfo;
 import com.djrapitops.plan.data.element.TableContainer;
 import com.djrapitops.plan.database.Database;
-import com.djrapitops.plan.system.settings.Settings;
 import com.djrapitops.plan.settings.theme.Theme;
+import com.djrapitops.plan.system.settings.Settings;
 import com.djrapitops.plan.utilities.FormatUtils;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plan.utilities.analysis.AnalysisUtils;
 import com.djrapitops.plan.utilities.comparators.GeoInfoComparator;
 import com.djrapitops.plan.utilities.comparators.UserInfoLastPlayedComparator;

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/PromptAuthorizationResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.utilities.html.Html;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/RedirectResponse.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 /**
  * @author Rsl1122

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/Response.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ResponseType.java

@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.response;
+package com.djrapitops.plan.system.webserver.response;
 
 /**
  * //TODO Class Javadoc Comment

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/BadRequestResponse.java

@@ -2,9 +2,9 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.response.api;
+package com.djrapitops.plan.system.webserver.response.api;
 
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
 
 /**
  * @author Fuzzlemann

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/JsonResponse.java

@@ -2,10 +2,10 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.response.api;
+package com.djrapitops.plan.system.webserver.response.api;
 
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.response.ResponseType;
+import com.djrapitops.plan.system.webserver.response.ResponseType;
 import com.google.gson.Gson;
 
 /**

Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/SuccessResponse.java

@@ -2,9 +2,9 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.response.api;
+package com.djrapitops.plan.system.webserver.response.api;
 
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
 
 /**
  * @author Fuzzlemann

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/WebAPI.java

@@ -2,18 +2,17 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi;
+package com.djrapitops.plan.system.webserver.webapi;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.*;
 import com.djrapitops.plan.system.settings.Settings;
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageId;
+import com.djrapitops.plan.system.webserver.pagecache.PageId;
-import com.djrapitops.plan.systems.webserver.response.NotFoundResponse;
+import com.djrapitops.plan.system.webserver.response.NotFoundResponse;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse;
+import com.djrapitops.plan.system.webserver.response.api.BadRequestResponse;
-import com.djrapitops.plan.systems.webserver.response.api.SuccessResponse;
+import com.djrapitops.plan.system.webserver.response.api.SuccessResponse;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.djrapitops.plugin.utilities.Verify;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/WebAPIManager.java

@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi;
+package com.djrapitops.plan.system.webserver.webapi;
 
 import com.djrapitops.plan.utilities.PassEncryptUtil;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/AnalysisReadyWebAPI.java

@@ -2,12 +2,12 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bukkit;
+package com.djrapitops.plan.system.webserver.webapi.bukkit;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 
 import java.util.Map;
 import java.util.UUID;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/AnalyzeWebAPI.java

@@ -2,12 +2,12 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bukkit;
+package com.djrapitops.plan.system.webserver.webapi.bukkit;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 
 import java.util.Map;
 import java.util.UUID;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/ConfigurationWebAPI.java

@@ -2,7 +2,7 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bukkit;
+package com.djrapitops.plan.system.webserver.webapi.bukkit;
 
 import com.djrapitops.plan.Plan;
 import com.djrapitops.plan.PlanBungee;
@@ -10,8 +10,8 @@ import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
 import com.djrapitops.plan.settings.ServerSpecificSettings;
 import com.djrapitops.plan.system.settings.Settings;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import com.djrapitops.plugin.api.Check;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.djrapitops.plugin.utilities.Verify;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/InspectWebAPI.java

@@ -2,12 +2,12 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bukkit;
+package com.djrapitops.plan.system.webserver.webapi.bukkit;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 
 import java.util.Map;
 import java.util.UUID;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/IsOnlineWebAPI.java

@@ -2,13 +2,13 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bukkit;
+package com.djrapitops.plan.system.webserver.webapi.bukkit;
 
 import com.djrapitops.plan.Plan;
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import org.bukkit.entity.Player;
 
 import java.util.Map;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java

@@ -2,13 +2,13 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bukkit;
+package com.djrapitops.plan.system.webserver.webapi.bukkit;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
+import com.djrapitops.plan.system.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import com.djrapitops.plan.systems.info.BukkitInformationManager;
-import com.djrapitops.plan.systems.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
 import com.djrapitops.plugin.api.Check;
 
 import java.util.Map;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/IsCachedWebAPI.java

@@ -2,14 +2,14 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bungee;
+package com.djrapitops.plan.system.webserver.webapi.bungee;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
 import com.djrapitops.plan.api.exceptions.WebAPINotFoundException;
+import com.djrapitops.plan.system.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import com.djrapitops.plan.systems.info.InformationManager;
-import com.djrapitops.plan.systems.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
 
 import java.util.Map;
 import java.util.UUID;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostHtmlWebAPI.java

@@ -2,18 +2,18 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bungee;
+package com.djrapitops.plan.system.webserver.webapi.bungee;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
 import com.djrapitops.plan.system.settings.Settings;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
+import com.djrapitops.plan.system.webserver.pagecache.PageId;
+import com.djrapitops.plan.system.webserver.response.AnalysisPageResponse;
+import com.djrapitops.plan.system.webserver.response.InspectPageResponse;
+import com.djrapitops.plan.system.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import com.djrapitops.plan.systems.info.InformationManager;
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageId;
-import com.djrapitops.plan.systems.webserver.response.AnalysisPageResponse;
-import com.djrapitops.plan.systems.webserver.response.InspectPageResponse;
-import com.djrapitops.plan.systems.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
 import com.djrapitops.plan.utilities.file.export.HtmlExport;
 import com.djrapitops.plugin.api.utility.log.Log;
 import org.apache.commons.lang3.text.StrSubstitutor;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java

@@ -2,13 +2,13 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bungee;
+package com.djrapitops.plan.system.webserver.webapi.bungee;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
+import com.djrapitops.plan.system.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import com.djrapitops.plan.systems.info.BungeeInformationManager;
-import com.djrapitops.plan.systems.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
 
 import java.util.Map;
 import java.util.UUID;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java

@@ -2,14 +2,14 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bungee;
+package com.djrapitops.plan.system.webserver.webapi.bungee;
 
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
+import com.djrapitops.plan.system.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import com.djrapitops.plan.systems.info.BungeeInformationManager;
-import com.djrapitops.plan.systems.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
 import com.djrapitops.plugin.api.Check;
 
 import java.util.Map;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java

@@ -2,15 +2,15 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bungee;
+package com.djrapitops.plan.system.webserver.webapi.bungee;
 
 
 import com.djrapitops.plan.PlanBungee;
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
 import com.djrapitops.plan.system.settings.Settings;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import com.djrapitops.plugin.api.Check;
 import com.djrapitops.plugin.utilities.Verify;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/RequestPluginsTabWebAPI.java

@@ -2,16 +2,16 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bungee;
+package com.djrapitops.plan.system.webserver.webapi.bungee;
 
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
+import com.djrapitops.plan.system.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI;
 import com.djrapitops.plan.systems.info.server.ServerInfo;
 import com.djrapitops.plan.systems.processing.Processor;
-import com.djrapitops.plan.systems.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI;
 import com.djrapitops.plugin.api.Check;
 import com.djrapitops.plugin.api.utility.log.Log;
 

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/RequestSetupWebAPI.java

@@ -2,17 +2,17 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.bungee;
+package com.djrapitops.plan.system.webserver.webapi.bungee;
 
 
 import com.djrapitops.plan.Plan;
 import com.djrapitops.plan.PlanBungee;
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
+import com.djrapitops.plan.system.webserver.response.ForbiddenResponse;
+import com.djrapitops.plan.system.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import com.djrapitops.plan.systems.info.server.ServerInfo;
-import com.djrapitops.plan.systems.webserver.response.ForbiddenResponse;
-import com.djrapitops.plan.systems.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
 import com.djrapitops.plugin.api.Check;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.djrapitops.plugin.utilities.Verify;

Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/universal/PingWebAPI.java

@@ -2,17 +2,16 @@
  * Licence is provided in the jar as license.yml also here:
  * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
  */
-package com.djrapitops.plan.systems.webserver.webapi.universal;
+package com.djrapitops.plan.system.webserver.webapi.universal;
 
 
 import com.djrapitops.plan.Plan;
 import com.djrapitops.plan.PlanBungee;
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
+import com.djrapitops.plan.system.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.webapi.WebAPI;
 import com.djrapitops.plan.systems.info.BukkitInformationManager;
-import com.djrapitops.plan.systems.webserver.response.Response;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPI;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plugin.api.Check;
 import com.djrapitops.plugin.api.utility.log.Log;
 

Plan/src/main/java/com/djrapitops/plan/systems/Systems.java

@@ -9,18 +9,17 @@ import com.djrapitops.plan.PlanBungee;
 import com.djrapitops.plan.settings.theme.Theme;
 import com.djrapitops.plan.system.SubSystem;
 import com.djrapitops.plan.system.file.FileSystem;
-import com.djrapitops.plan.system.settings.config.ConfigSystem;
-import com.djrapitops.plan.system.settings.config.BungeeConfigSystem;
 import com.djrapitops.plan.system.settings.config.BukkitConfigSystem;
+import com.djrapitops.plan.system.settings.config.BungeeConfigSystem;
+import com.djrapitops.plan.system.settings.config.ConfigSystem;
+import com.djrapitops.plan.system.update.VersionCheckSystem;
+import com.djrapitops.plan.system.webserver.WebServerSystem;
 import com.djrapitops.plan.systems.file.database.DBSystem;
 import com.djrapitops.plan.systems.file.database.PlanBungeeDBSystem;
 import com.djrapitops.plan.systems.file.database.PlanDBSystem;
 import com.djrapitops.plan.systems.tasks.PlanBungeeTaskSystem;
 import com.djrapitops.plan.systems.tasks.PlanTaskSystem;
 import com.djrapitops.plan.systems.tasks.TaskSystem;
-import com.djrapitops.plan.system.update.VersionCheckSystem;
-import com.djrapitops.plan.systems.webserver.WebServerSystem;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plugin.api.utility.log.Log;
 import org.apache.commons.lang3.ArrayUtils;
 

Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java

@@ -11,23 +11,23 @@ import com.djrapitops.plan.data.AnalysisData;
 import com.djrapitops.plan.data.element.InspectContainer;
 import com.djrapitops.plan.data.plugin.HookHandler;
 import com.djrapitops.plan.data.plugin.PluginData;
-import com.djrapitops.plan.system.settings.Settings;
 import com.djrapitops.plan.settings.theme.Theme;
+import com.djrapitops.plan.system.settings.Settings;
+import com.djrapitops.plan.system.webserver.WebServer;
+import com.djrapitops.plan.system.webserver.WebServerSystem;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
+import com.djrapitops.plan.system.webserver.pagecache.PageId;
+import com.djrapitops.plan.system.webserver.response.*;
+import com.djrapitops.plan.system.webserver.webapi.WebAPIManager;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.AnalysisReadyWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.AnalyzeWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bungee.*;
+import com.djrapitops.plan.system.webserver.webapi.universal.PingWebAPI;
 import com.djrapitops.plan.systems.cache.DataCache;
 import com.djrapitops.plan.systems.info.parsing.AnalysisPageParser;
 import com.djrapitops.plan.systems.info.parsing.InspectPageParser;
 import com.djrapitops.plan.systems.processing.Processor;
-import com.djrapitops.plan.systems.webserver.WebServer;
-import com.djrapitops.plan.systems.webserver.WebServerSystem;
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageId;
-import com.djrapitops.plan.systems.webserver.response.*;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalysisReadyWebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalyzeWebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.bungee.*;
-import com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI;
 import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plan.utilities.analysis.Analysis;
 import com.djrapitops.plan.utilities.file.export.HtmlExport;

Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java

@@ -10,20 +10,19 @@ import com.djrapitops.plan.api.exceptions.WebAPIConnectionFailException;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
 import com.djrapitops.plan.api.exceptions.WebAPINotFoundException;
 import com.djrapitops.plan.system.settings.Settings;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
+import com.djrapitops.plan.system.webserver.pagecache.PageId;
+import com.djrapitops.plan.system.webserver.response.*;
+import com.djrapitops.plan.system.webserver.webapi.WebAPIManager;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.AnalysisReadyWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.AnalyzeWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.InspectWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.IsOnlineWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bungee.RequestPluginsTabWebAPI;
 import com.djrapitops.plan.systems.cache.DataCache;
 import com.djrapitops.plan.systems.info.parsing.NetworkPageParser;
 import com.djrapitops.plan.systems.info.server.BungeeServerInfoManager;
 import com.djrapitops.plan.systems.info.server.ServerInfo;
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageId;
-import com.djrapitops.plan.systems.webserver.response.*;
-import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalysisReadyWebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalyzeWebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.InspectWebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.IsOnlineWebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.bungee.RequestPluginsTabWebAPI;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plan.utilities.file.export.HtmlExport;
 import com.djrapitops.plan.utilities.html.HtmlStructure;
 import com.djrapitops.plugin.api.utility.log.ErrorLogger;

Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java

@@ -5,10 +5,10 @@
 package com.djrapitops.plan.systems.info;
 
 import com.djrapitops.plan.api.exceptions.ParseException;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
+import com.djrapitops.plan.system.webserver.pagecache.PageId;
 import com.djrapitops.plan.systems.cache.DataCache;
 import com.djrapitops.plan.systems.cache.SessionCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageId;
 import com.djrapitops.plugin.command.ISender;
 
 import java.io.IOException;

Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java

@@ -10,8 +10,8 @@ import com.djrapitops.plan.api.exceptions.EnableException;
 import com.djrapitops.plan.api.exceptions.WebAPIException;
 import com.djrapitops.plan.database.Database;
 import com.djrapitops.plan.database.tables.ServerTable;
-import com.djrapitops.plan.systems.webserver.webapi.bukkit.ConfigurationWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bukkit.ConfigurationWebAPI;
-import com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.universal.PingWebAPI;
 import com.djrapitops.plugin.api.TimeAmount;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.djrapitops.plugin.task.AbsRunnable;

Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java

@@ -8,17 +8,17 @@ import com.djrapitops.plan.data.element.AnalysisContainer;
 import com.djrapitops.plan.data.plugin.BanData;
 import com.djrapitops.plan.data.plugin.PluginData;
 import com.djrapitops.plan.database.Database;
-import com.djrapitops.plan.system.settings.Settings;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.Msg;
+import com.djrapitops.plan.system.settings.Settings;
+import com.djrapitops.plan.system.webserver.response.ErrorResponse;
+import com.djrapitops.plan.system.webserver.response.InternalErrorResponse;
 import com.djrapitops.plan.systems.cache.DataCache;
 import com.djrapitops.plan.systems.cache.SessionCache;
 import com.djrapitops.plan.systems.info.BukkitInformationManager;
 import com.djrapitops.plan.systems.info.InformationManager;
 import com.djrapitops.plan.systems.tasks.PlanTaskSystem;
 import com.djrapitops.plan.systems.tasks.TaskSystem;
-import com.djrapitops.plan.systems.webserver.response.ErrorResponse;
-import com.djrapitops.plan.systems.webserver.response.InternalErrorResponse;
 import com.djrapitops.plugin.StaticHolder;
 import com.djrapitops.plugin.api.Benchmark;
 import com.djrapitops.plugin.api.utility.log.Log;

Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java

@@ -8,8 +8,8 @@ import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.data.container.UserInfo;
 import com.djrapitops.plan.settings.theme.Theme;
 import com.djrapitops.plan.settings.theme.ThemeVal;
-import com.djrapitops.plan.systems.webserver.response.PlayersPageResponse;
+import com.djrapitops.plan.system.webserver.response.PlayersPageResponse;
-import com.djrapitops.plan.systems.webserver.webapi.bungee.PostHtmlWebAPI;
+import com.djrapitops.plan.system.webserver.webapi.bungee.PostHtmlWebAPI;
 import com.djrapitops.plan.utilities.file.FileUtil;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.djrapitops.plugin.task.RunnableFactory;

Plan/src/main/java/com/djrapitops/plan/utilities/file/export/SpecificExport.java

@@ -5,10 +5,9 @@
 package com.djrapitops.plan.utilities.file.export;
 
 import com.djrapitops.plan.system.settings.Settings;
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageId;
+import com.djrapitops.plan.system.webserver.pagecache.PageId;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
-import com.djrapitops.plan.utilities.MiscUtils;
 import com.djrapitops.plugin.api.Check;
 import com.djrapitops.plugin.api.utility.log.Log;
 import com.djrapitops.plugin.task.AbsRunnable;

Plan/test/main/java/com/djrapitops/plan/data/cache/PageCacheTest.java

@@ -1,8 +1,8 @@
 package com.djrapitops.plan.data.cache;
 
-import com.djrapitops.plan.systems.webserver.pagecache.PageCache;
+import com.djrapitops.plan.system.webserver.pagecache.PageCache;
-import com.djrapitops.plan.systems.webserver.pagecache.PageLoader;
+import com.djrapitops.plan.system.webserver.pagecache.PageLoader;
-import com.djrapitops.plan.systems.webserver.response.Response;
+import com.djrapitops.plan.system.webserver.response.Response;
 import org.junit.Test;
 import test.utilities.RandomData;
 

Plan/test/main/java/com/djrapitops/plan/system/webserver/WebServerTest.java

@@ -1,4 +1,4 @@
-package com.djrapitops.plan.systems.webserver;
+package com.djrapitops.plan.system.webserver;
 
 import com.djrapitops.plan.Plan;
 import com.sun.net.httpserver.HttpExchange;