Restructure package structure.

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

@@ -24,27 +24,34 @@ import com.djrapitops.plugin.api.TimeAmount;
 import com.djrapitops.plugin.settings.ColorScheme;
 import com.djrapitops.plugin.task.AbsRunnable;
 import com.djrapitops.plugin.task.ITask;
+import com.djrapitops.plugin.task.RunnableFactory;
 import com.djrapitops.plugin.utilities.Verify;
 import main.java.com.djrapitops.plan.api.API;
 import main.java.com.djrapitops.plan.command.PlanCommand;
 import main.java.com.djrapitops.plan.command.commands.RegisterCommandFilter;
 import main.java.com.djrapitops.plan.data.additional.HookHandler;
-import main.java.com.djrapitops.plan.data.cache.DataCache;
-import main.java.com.djrapitops.plan.data.cache.PageCacheHandler;
-import main.java.com.djrapitops.plan.data.listeners.*;
-import main.java.com.djrapitops.plan.data.server.ServerInfoManager;
 import main.java.com.djrapitops.plan.database.Database;
 import main.java.com.djrapitops.plan.database.databases.MySQLDB;
 import main.java.com.djrapitops.plan.database.databases.SQLiteDB;
 import main.java.com.djrapitops.plan.locale.Locale;
 import main.java.com.djrapitops.plan.locale.Msg;
-import main.java.com.djrapitops.plan.queue.processing.ProcessingQueue;
-import main.java.com.djrapitops.plan.queue.processing.Processor;
-import main.java.com.djrapitops.plan.ui.webserver.WebServer;
-import main.java.com.djrapitops.plan.ui.webserver.api.bukkit.*;
+import main.java.com.djrapitops.plan.systems.cache.DataCache;
+import main.java.com.djrapitops.plan.systems.cache.PageCacheHandler;
+import main.java.com.djrapitops.plan.systems.info.server.ServerInfoManager;
+import main.java.com.djrapitops.plan.systems.listeners.*;
+import main.java.com.djrapitops.plan.systems.processing.Processor;
+import main.java.com.djrapitops.plan.systems.queue.ProcessingQueue;
+import main.java.com.djrapitops.plan.systems.tasks.PeriodicDBCommitTask;
+import main.java.com.djrapitops.plan.systems.tasks.TPSCountTimer;
+import main.java.com.djrapitops.plan.systems.webapi.WebAPIManager;
+import main.java.com.djrapitops.plan.systems.webapi.bukkit.AnalyticsWebAPI;
+import main.java.com.djrapitops.plan.systems.webapi.bukkit.AnalyzeWebAPI;
+import main.java.com.djrapitops.plan.systems.webapi.bukkit.ConfigureWebAPI;
+import main.java.com.djrapitops.plan.systems.webapi.bukkit.InspectWebAPI;
+import main.java.com.djrapitops.plan.systems.webserver.WebServer;
+import main.java.com.djrapitops.plan.ui.webserver.api.bukkit.InspectionWebAPI;
 import main.java.com.djrapitops.plan.utilities.Benchmark;
 import main.java.com.djrapitops.plan.utilities.Check;
-import main.java.com.djrapitops.plan.utilities.webserver.api.WebAPIManager;
 import org.apache.logging.log4j.LogManager;
 import org.bukkit.ChatColor;
 
@@ -155,27 +162,12 @@ public class Plan extends BukkitPlugin<Plan> {
             this.dataCache = new DataCache(this);
             Benchmark.stop("Enable", "Init DataCache");
 
-            tpsCountTimer = new TPSCountTimer(this);
-            super.getRunnableFactory().createNew(tpsCountTimer).runTaskTimer(1000, TimeAmount.SECOND.ticks());
             registerListeners();
-
             this.api = new API(this);
 
-            Benchmark.start("Analysis refresh task registration");
-            // Analysis refresh settings
-            int analysisRefreshMinutes = Settings.ANALYSIS_AUTO_REFRESH.getNumber();
-            boolean analysisRefreshTaskIsEnabled = analysisRefreshMinutes > 0;
-
-            // Analysis refresh tasks
-            startBootAnalysisTask();
-            if (analysisRefreshTaskIsEnabled) {
-                startAnalysisRefreshTask(analysisRefreshMinutes);
-            }
-
-            Benchmark.stop("Enable", "Analysis refresh task registration");
+            registerTasks();
 
             Benchmark.start("WebServer Initialization");
-
             uiServer = new WebServer(this);
             registerWebAPIs(); // TODO Move to WebServer class
             uiServer.initServer();
@@ -224,6 +216,44 @@ public class Plan extends BukkitPlugin<Plan> {
         }
     }
 
+    private void registerTasks() {
+        RunnableFactory runnableFactory = getRunnableFactory();
+        String bootAnalysisMsg = Locale.get(Msg.ENABLE_BOOT_ANALYSIS_INFO).toString();
+        String bootAnalysisRunMsg = Locale.get(Msg.ENABLE_BOOT_ANALYSIS_RUN_INFO).toString();
+
+        Benchmark.start("Task Registration");
+        tpsCountTimer = new TPSCountTimer(this);
+
+        long period = TimeAmount.MINUTE.ticks() * 5L;
+
+        runnableFactory.createNew(tpsCountTimer).runTaskTimer(1000, TimeAmount.SECOND.ticks());
+        runnableFactory.createNew(new PeriodicDBCommitTask(this)).runTaskTimerAsynchronously(period, period);
+        // Analysis refresh settings
+        int analysisRefreshMinutes = Settings.ANALYSIS_AUTO_REFRESH.getNumber();
+        boolean analysisRefreshTaskIsEnabled = analysisRefreshMinutes > 0;
+        long analysisPeriod = analysisRefreshMinutes * TimeAmount.MINUTE.ticks();
+
+        Log.info(bootAnalysisMsg);
+        ITask bootAnalysisTask = runnableFactory.createNew("BootAnalysisTask", new AbsRunnable() {
+            @Override
+            public void run() {
+                Log.info(bootAnalysisRunMsg);
+                //TODO analysisCache.updateCache();
+                this.cancel();
+            }
+        }).runTaskLaterAsynchronously(30 * TimeAmount.SECOND.ticks());
+        bootAnalysisTaskID = bootAnalysisTask.getTaskId();
+        if (analysisRefreshTaskIsEnabled) {
+            runnableFactory.createNew("PeriodicalAnalysisTask", new AbsRunnable() {
+                @Override
+                public void run() {
+                    // TODO Update Analysis cache
+                }
+            }).runTaskTimerAsynchronously(analysisPeriod, analysisPeriod);
+        }
+        Benchmark.stop("Enable", "Task Registration");
+    }
+
     private void initColorScheme() {
         try {
             ChatColor mainColor = ChatColor.getByChar(Settings.COLOR_MAIN.toString().charAt(1));
@@ -315,45 +345,6 @@ public class Plan extends BukkitPlugin<Plan> {
         return Check.errorIfFalse(db.init(), Locale.get(Msg.ENABLE_DB_FAIL_DISABLE_INFO).toString());
     }
 
-    private void startAnalysisRefreshTask(int everyXMinutes) {
-        Benchmark.start("Schedule PeriodicAnalysisTask");
-        if (everyXMinutes <= 0) {
-            return;
-        }
-        getRunnableFactory().createNew("PeriodicalAnalysisTask", new AbsRunnable() {
-            @Override
-            public void run() {
-                Log.debug("Running PeriodicalAnalysisTask");
-                // TODO DataCacheMethod for checking analysis refresh date.
-                if (true) {
-//                 TODO   analysisCache.updateCache();
-                }
-            }
-        }).runTaskTimerAsynchronously(everyXMinutes * TimeAmount.MINUTE.ticks(), everyXMinutes * TimeAmount.MINUTE.ticks());
-        Benchmark.stop("Schedule PeriodicAnalysisTask");
-    }
-
-    private void startBootAnalysisTask() {
-        Benchmark.start("Schedule boot analysis task");
-        String bootAnalysisMsg = Locale.get(Msg.ENABLE_BOOT_ANALYSIS_INFO).toString();
-        String bootAnalysisRunMsg = Locale.get(Msg.ENABLE_BOOT_ANALYSIS_RUN_INFO).toString();
-
-        Log.info(bootAnalysisMsg);
-
-        ITask bootAnalysisTask = getRunnableFactory().createNew("BootAnalysisTask", new AbsRunnable() {
-            @Override
-            public void run() {
-                Log.debug("Running BootAnalysisTask");
-                Log.info(bootAnalysisRunMsg);
-
-                //TODO analysisCache.updateCache();
-                this.cancel();
-            }
-        }).runTaskLaterAsynchronously(30 * TimeAmount.SECOND.ticks());
-        bootAnalysisTaskID = bootAnalysisTask.getTaskId();
-        Benchmark.stop("Enable", "Schedule boot analysis task");
-    }
-
     /**
      * Setups the command console output filter
      */

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

@@ -7,9 +7,9 @@ import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.AnalysisData;
 import main.java.com.djrapitops.plan.data.additional.AnalysisType;
 import main.java.com.djrapitops.plan.data.additional.PluginData;
+import main.java.com.djrapitops.plan.systems.webserver.WebServer;
 import main.java.com.djrapitops.plan.ui.html.DataRequestHandler;
-import main.java.com.djrapitops.plan.ui.webserver.WebServer;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility;
 
 import java.sql.SQLException;

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

@@ -14,8 +14,8 @@ import main.java.com.djrapitops.plan.command.ConditionUtils;
 import main.java.com.djrapitops.plan.locale.Locale;
 import main.java.com.djrapitops.plan.locale.Msg;
 import main.java.com.djrapitops.plan.utilities.Check;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility;
 import org.bukkit.ChatColor;
 

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

@@ -9,7 +9,7 @@ import main.java.com.djrapitops.plan.command.ConditionUtils;
 import main.java.com.djrapitops.plan.locale.Locale;
 import main.java.com.djrapitops.plan.locale.Msg;
 import main.java.com.djrapitops.plan.utilities.Check;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 
 /**
  * Command used to display link to the player list webpage.

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

@@ -6,8 +6,8 @@ package main.java.com.djrapitops.plan.data;
 
 import com.google.common.base.Objects;
 import main.java.com.djrapitops.plan.database.tables.Actions;
-import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
+import main.java.com.djrapitops.plan.utilities.html.Html;
 
 /**
  * Class that represents an action made by a player.

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

@@ -4,8 +4,8 @@ import com.djrapitops.plugin.utilities.Verify;
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.data.analysis.*;
 import main.java.com.djrapitops.plan.utilities.Benchmark;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 
 import java.io.Serializable;
 import java.util.Arrays;

Plan/src/main/java/com/djrapitops/plan/data/additional/HookHandler.java

@@ -3,7 +3,7 @@ package main.java.com.djrapitops.plan.data.additional;
 import com.djrapitops.pluginbridge.plan.Bridge;
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 
 import java.io.Serializable;
 import java.util.*;

Plan/src/main/java/com/djrapitops/plan/data/additional/PluginData.java

@@ -1,6 +1,6 @@
 package main.java.com.djrapitops.plan.data.additional;
 
-import main.java.com.djrapitops.plan.ui.html.Html;
+import main.java.com.djrapitops.plan.utilities.html.Html;
 
 import java.io.Serializable;
 import java.util.*;

Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java

@@ -4,15 +4,15 @@ import com.djrapitops.plugin.api.TimeAmount;
 import com.djrapitops.plugin.utilities.Verify;
 import main.java.com.djrapitops.plan.data.Session;
 import main.java.com.djrapitops.plan.data.TPS;
-import main.java.com.djrapitops.plan.ui.html.graphs.PlayerActivityGraphCreator;
-import main.java.com.djrapitops.plan.ui.html.graphs.PunchCardGraphCreator;
-import main.java.com.djrapitops.plan.ui.html.graphs.SessionLengthDistributionGraphCreator;
-import main.java.com.djrapitops.plan.ui.theme.Colors;
+import main.java.com.djrapitops.plan.systems.webserver.theme.Colors;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
 import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils;
 import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
+import main.java.com.djrapitops.plan.utilities.html.graphs.PlayerActivityGraphCreator;
+import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraphCreator;
+import main.java.com.djrapitops.plan.utilities.html.graphs.SessionLengthDistributionGraphCreator;
 
 import java.util.*;
 import java.util.stream.Collectors;

Plan/src/main/java/com/djrapitops/plan/data/analysis/CommandUsagePart.java

@@ -5,8 +5,8 @@
  */
 package main.java.com.djrapitops.plan.data.analysis;
 
-import main.java.com.djrapitops.plan.ui.html.tables.CommandUseTableCreator;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
+import main.java.com.djrapitops.plan.utilities.html.tables.CommandUseTableCreator;
 
 import java.util.Map;
 

Plan/src/main/java/com/djrapitops/plan/data/analysis/GamemodePart.java

@@ -1,7 +1,7 @@
 package main.java.com.djrapitops.plan.data.analysis;
 
 import com.djrapitops.plugin.utilities.Verify;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 
 /**
  * Part responsible for all Gamemode usage related analysis.

Plan/src/main/java/com/djrapitops/plan/data/analysis/GeolocationPart.java

@@ -1,6 +1,6 @@
 package main.java.com.djrapitops.plan.data.analysis;
 
-import main.java.com.djrapitops.plan.ui.html.graphs.WorldMapCreator;
+import main.java.com.djrapitops.plan.utilities.html.graphs.WorldMapCreator;
 
 import java.util.HashMap;
 import java.util.Map;

Plan/src/main/java/com/djrapitops/plan/data/analysis/TPSPart.java

@@ -3,14 +3,14 @@ package main.java.com.djrapitops.plan.data.analysis;
 import com.djrapitops.plugin.api.TimeAmount;
 import main.java.com.djrapitops.plan.Settings;
 import main.java.com.djrapitops.plan.data.TPS;
-import main.java.com.djrapitops.plan.ui.html.graphs.CPUGraphCreator;
-import main.java.com.djrapitops.plan.ui.html.graphs.RamGraphCreator;
-import main.java.com.djrapitops.plan.ui.html.graphs.TPSGraphCreator;
-import main.java.com.djrapitops.plan.ui.html.graphs.WorldLoadGraphCreator;
-import main.java.com.djrapitops.plan.ui.theme.Colors;
+import main.java.com.djrapitops.plan.systems.webserver.theme.Colors;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
 import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
+import main.java.com.djrapitops.plan.utilities.html.graphs.CPUGraphCreator;
+import main.java.com.djrapitops.plan.utilities.html.graphs.RamGraphCreator;
+import main.java.com.djrapitops.plan.utilities.html.graphs.TPSGraphCreator;
+import main.java.com.djrapitops.plan.utilities.html.graphs.WorldLoadGraphCreator;
 
 import java.util.List;
 

Plan/src/main/java/com/djrapitops/plan/data/analysis/WorldPart.java

@@ -1,6 +1,6 @@
 package main.java.com.djrapitops.plan.data.analysis;
 
-import main.java.com.djrapitops.plan.ui.html.graphs.WorldPieCreator;
+import main.java.com.djrapitops.plan.utilities.html.graphs.WorldPieCreator;
 
 import java.util.HashMap;
 import java.util.Map;

Plan/src/main/java/com/djrapitops/plan/data/cache/AnalysisCacheHandler.java

@@ -7,8 +7,8 @@ import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.AnalysisData;
 import main.java.com.djrapitops.plan.locale.Locale;
 import main.java.com.djrapitops.plan.locale.Msg;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.analysis.Analysis;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 import org.bukkit.entity.Player;
 
 import java.util.HashSet;

Plan/src/main/java/com/djrapitops/plan/database/tables/ServerTable.java

@@ -5,9 +5,9 @@
 package main.java.com.djrapitops.plan.database.tables;
 
 import com.djrapitops.plugin.utilities.Verify;
-import main.java.com.djrapitops.plan.data.server.ServerInfo;
 import main.java.com.djrapitops.plan.database.databases.SQLDB;
 import main.java.com.djrapitops.plan.database.sql.*;
+import main.java.com.djrapitops.plan.systems.info.server.ServerInfo;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

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

@@ -7,11 +7,11 @@ import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Permissions;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.Settings;
-import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.Benchmark;
 import main.java.com.djrapitops.plan.utilities.comparators.LocaleEntryComparator;
 import main.java.com.djrapitops.plan.utilities.comparators.StringLengthComparator;
 import main.java.com.djrapitops.plan.utilities.file.FileUtil;
+import main.java.com.djrapitops.plan.utilities.html.Html;
 import org.bukkit.ChatColor;
 
 import java.io.File;

Plan/src/main/java/com/djrapitops/plan/systems/cache/DataCache.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.data.cache;
+package main.java.com.djrapitops.plan.systems.cache;
 
 import com.djrapitops.plugin.task.AbsRunnable;
 import main.java.com.djrapitops.plan.Log;

Plan/src/main/java/com/djrapitops/plan/systems/cache/GeolocationCacheHandler.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.data.cache;
+package main.java.com.djrapitops.plan.systems.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;

Plan/src/main/java/com/djrapitops/plan/systems/cache/PageCacheHandler.java

@@ -1,8 +1,8 @@
-package main.java.com.djrapitops.plan.data.cache;
+package main.java.com.djrapitops.plan.systems.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
 
 import java.util.Map;
 import java.util.function.Predicate;

Plan/src/main/java/com/djrapitops/plan/systems/cache/PageLoader.java

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

Plan/src/main/java/com/djrapitops/plan/systems/cache/SessionCache.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.data.cache;
+package main.java.com.djrapitops.plan.systems.cache;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;

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

@@ -0,0 +1,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 main.java.com.djrapitops.plan.systems.info;
+
+/**
+ * //TODO Class Javadoc Comment
+ *
+ * @author Rsl1122
+ */
+public class InformationManager {
+    // TODO Class that manages ALL information for API, WebAPI requests, Command Caching etc.
+}

Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfo.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 main.java.com.djrapitops.plan.data.server;
+package main.java.com.djrapitops.plan.systems.info.server;
 
 import com.google.common.base.Objects;
 

Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfoFile.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 main.java.com.djrapitops.plan.data.server;
+package main.java.com.djrapitops.plan.systems.info.server;
 
 import com.djrapitops.plugin.config.BukkitConfig;
 import com.djrapitops.plugin.utilities.Verify;

Plan/src/main/java/com/djrapitops/plan/systems/info/server/ServerInfoManager.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 main.java.com.djrapitops.plan.data.server;
+package main.java.com.djrapitops.plan.systems.info.server;
 
 
 import main.java.com.djrapitops.plan.Log;

Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanChatListener.java

@@ -1,7 +1,7 @@
-package main.java.com.djrapitops.plan.data.listeners;
+package main.java.com.djrapitops.plan.systems.listeners;
 
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.data.handling.player.NameProcessor;
+import main.java.com.djrapitops.plan.systems.processing.player.NameProcessor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanCommandPreprocessListener.java

@@ -1,9 +1,9 @@
-package main.java.com.djrapitops.plan.data.listeners;
+package main.java.com.djrapitops.plan.systems.listeners;
 
 import main.java.com.djrapitops.plan.Permissions;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.Settings;
-import main.java.com.djrapitops.plan.data.cache.DataCache;
+import main.java.com.djrapitops.plan.systems.cache.DataCache;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanDeathEventListener.java

@@ -1,9 +1,9 @@
-package main.java.com.djrapitops.plan.data.listeners;
+package main.java.com.djrapitops.plan.systems.listeners;
 
 import com.djrapitops.plugin.utilities.Verify;
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.data.handling.player.DeathProcessor;
-import main.java.com.djrapitops.plan.data.handling.player.KillProcessor;
+import main.java.com.djrapitops.plan.systems.processing.player.DeathProcessor;
+import main.java.com.djrapitops.plan.systems.processing.player.KillProcessor;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
 import org.apache.commons.lang3.text.WordUtils;
 import org.bukkit.Material;

Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanGamemodeChangeListener.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.data.listeners;
+package main.java.com.djrapitops.plan.systems.listeners;
 
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.Session;

Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanPlayerListener.java

@@ -1,11 +1,11 @@
-package main.java.com.djrapitops.plan.data.listeners;
+package main.java.com.djrapitops.plan.systems.listeners;
 
 import com.djrapitops.plugin.utilities.player.Fetch;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.Session;
-import main.java.com.djrapitops.plan.data.cache.DataCache;
-import main.java.com.djrapitops.plan.data.handling.DBCommitProcessor;
-import main.java.com.djrapitops.plan.data.handling.player.*;
+import main.java.com.djrapitops.plan.systems.cache.DataCache;
+import main.java.com.djrapitops.plan.systems.processing.DBCommitProcessor;
+import main.java.com.djrapitops.plan.systems.processing.player.*;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

Plan/src/main/java/com/djrapitops/plan/systems/listeners/PlanWorldChangeListener.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.data.listeners;
+package main.java.com.djrapitops.plan.systems.listeners;
 
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.Session;

Plan/src/main/java/com/djrapitops/plan/systems/processing/DBCommitProcessor.java

@@ -2,11 +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 main.java.com.djrapitops.plan.data.handling;
+package main.java.com.djrapitops.plan.systems.processing;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.database.Database;
-import main.java.com.djrapitops.plan.queue.processing.Processor;
 
 import java.sql.SQLException;
 

Plan/src/main/java/com/djrapitops/plan/systems/processing/Processor.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 main.java.com.djrapitops.plan.queue.processing;
+package main.java.com.djrapitops.plan.systems.processing;
 
 /**
  * Abstract class for processing different objects using Generics.

Plan/src/main/java/com/djrapitops/plan/systems/processing/TPSInsertProcessor.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 main.java.com.djrapitops.plan.data.handling;
+package main.java.com.djrapitops.plan.systems.processing;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.TPS;
-import main.java.com.djrapitops.plan.queue.processing.Processor;
 import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
 
 import java.sql.SQLException;

Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/Importer.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.data.handling.importing;
+package main.java.com.djrapitops.plan.systems.processing.importing;
 
 /**
  * Abstract class used for importing data from other plugins.

Plan/src/main/java/com/djrapitops/plan/systems/processing/importing/OfflinePlayerImporter.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.data.handling.importing;
+package main.java.com.djrapitops.plan.systems.processing.importing;
 
 /**
  * Imports all players who have not joined since Plan was installed.

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/BanProcessor.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 main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import java.util.UUID;
 

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/DeathProcessor.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import java.util.UUID;
 

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/EndSessionProcessor.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 main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import main.java.com.djrapitops.plan.Plan;
 

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/FirstLeaveProcessor.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 main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/IPUpdateProcessor.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 main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.data.cache.GeolocationCacheHandler;
+import main.java.com.djrapitops.plan.systems.cache.GeolocationCacheHandler;
 
 import java.sql.SQLException;
 import java.util.UUID;

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KickProcessor.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 main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/KillProcessor.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.KillData;

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/NameProcessor.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 main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/OPProcessor.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 main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import java.util.UUID;
 

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/PlayerProcessor.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 main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
-import main.java.com.djrapitops.plan.queue.processing.Processor;
+import main.java.com.djrapitops.plan.systems.processing.Processor;
 
 import java.util.UUID;
 

Plan/src/main/java/com/djrapitops/plan/systems/processing/player/RegisterProcessor.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 main.java.com.djrapitops.plan.data.handling.player;
+package main.java.com.djrapitops.plan.systems.processing.player;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.Action;
-import main.java.com.djrapitops.plan.data.listeners.PlanPlayerListener;
 import main.java.com.djrapitops.plan.database.Database;
 import main.java.com.djrapitops.plan.database.tables.Actions;
+import main.java.com.djrapitops.plan.systems.listeners.PlanPlayerListener;
 
 import java.sql.SQLException;
 import java.util.UUID;

Plan/src/main/java/com/djrapitops/plan/systems/queue/Consumer.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.queue;
+package main.java.com.djrapitops.plan.systems.queue;
 
 import com.djrapitops.plugin.task.AbsRunnable;
 import main.java.com.djrapitops.plan.Log;

Plan/src/main/java/com/djrapitops/plan/systems/queue/ProcessingQueue.java

@@ -1,9 +1,7 @@
-package main.java.com.djrapitops.plan.queue.processing;
+package main.java.com.djrapitops.plan.systems.queue;
 
 import main.java.com.djrapitops.plan.Log;
-import main.java.com.djrapitops.plan.queue.Consumer;
-import main.java.com.djrapitops.plan.queue.Queue;
-import main.java.com.djrapitops.plan.queue.Setup;
+import main.java.com.djrapitops.plan.systems.processing.Processor;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;

Plan/src/main/java/com/djrapitops/plan/systems/queue/Queue.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.queue;
+package main.java.com.djrapitops.plan.systems.queue;
 
 import java.util.ArrayList;
 import java.util.List;

Plan/src/main/java/com/djrapitops/plan/systems/queue/Setup.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.queue;
+package main.java.com.djrapitops.plan.systems.queue;
 
 import main.java.com.djrapitops.plan.Plan;
 

Plan/src/main/java/com/djrapitops/plan/systems/tasks/PeriodicDBCommitTask.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 main.java.com.djrapitops.plan.data.listeners;
+package main.java.com.djrapitops.plan.systems.tasks;
 
 import com.djrapitops.plugin.task.AbsRunnable;
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.data.handling.DBCommitProcessor;
 import main.java.com.djrapitops.plan.database.Database;
+import main.java.com.djrapitops.plan.systems.processing.DBCommitProcessor;
 
 /**
  * Periodically commits changes to the SQLite Database.

Plan/src/main/java/com/djrapitops/plan/systems/tasks/TPSCountTimer.java

@@ -1,12 +1,12 @@
-package main.java.com.djrapitops.plan.data.listeners;
+package main.java.com.djrapitops.plan.systems.tasks;
 
 import com.djrapitops.plugin.api.TimeAmount;
 import com.djrapitops.plugin.task.AbsRunnable;
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.TPS;
-import main.java.com.djrapitops.plan.data.cache.DataCache;
-import main.java.com.djrapitops.plan.data.handling.TPSInsertProcessor;
+import main.java.com.djrapitops.plan.systems.cache.DataCache;
+import main.java.com.djrapitops.plan.systems.processing.TPSInsertProcessor;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
 import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
 import org.bukkit.World;

Plan/src/main/java/com/djrapitops/plan/systems/webapi/WebAPI.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 main.java.com.djrapitops.plan.utilities.webserver.api;
+package main.java.com.djrapitops.plan.systems.webapi;
 
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
 
 import java.util.Map;
 

Plan/src/main/java/com/djrapitops/plan/systems/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 main.java.com.djrapitops.plan.utilities.webserver.api;
+package main.java.com.djrapitops.plan.systems.webapi;
 
 import java.util.HashMap;
 import java.util.Map;

Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/AnalyticsWebAPI.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 main.java.com.djrapitops.plan.ui.webserver.api.bukkit;
+package main.java.com.djrapitops.plan.systems.webapi.bukkit;
 
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.data.cache.PageCacheHandler;
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.BadRequestResponse;
-import main.java.com.djrapitops.plan.utilities.webserver.api.WebAPI;
+import main.java.com.djrapitops.plan.systems.cache.PageCacheHandler;
+import main.java.com.djrapitops.plan.systems.webapi.WebAPI;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse;
 
 import java.util.Map;
 

Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/AnalyzeWebAPI.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 main.java.com.djrapitops.plan.ui.webserver.api.bukkit;
+package main.java.com.djrapitops.plan.systems.webapi.bukkit;
 
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.data.cache.PageCacheHandler;
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.SuccessResponse;
-import main.java.com.djrapitops.plan.utilities.webserver.api.WebAPI;
+import main.java.com.djrapitops.plan.systems.cache.PageCacheHandler;
+import main.java.com.djrapitops.plan.systems.webapi.WebAPI;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.SuccessResponse;
 
 import java.util.Map;
 

Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/ConfigureWebAPI.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 main.java.com.djrapitops.plan.ui.webserver.api.bukkit;
+package main.java.com.djrapitops.plan.systems.webapi.bukkit;
 
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.data.cache.PageCacheHandler;
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.BadRequestResponse;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.SuccessResponse;
-import main.java.com.djrapitops.plan.utilities.webserver.api.WebAPI;
-import org.apache.commons.lang3.text.translate.CharSequenceTranslator;
+import main.java.com.djrapitops.plan.systems.cache.PageCacheHandler;
+import main.java.com.djrapitops.plan.systems.webapi.WebAPI;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.SuccessResponse;
 import org.bukkit.configuration.file.FileConfiguration;
 
 import java.util.Map;

Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/InspectWebAPI.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 main.java.com.djrapitops.plan.ui.webserver.api.bukkit;
+package main.java.com.djrapitops.plan.systems.webapi.bukkit;
 
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.data.cache.PageCacheHandler;
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.BadRequestResponse;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.SuccessResponse;
+import main.java.com.djrapitops.plan.systems.cache.PageCacheHandler;
+import main.java.com.djrapitops.plan.systems.webapi.WebAPI;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.SuccessResponse;
 import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility;
-import main.java.com.djrapitops.plan.utilities.webserver.api.WebAPI;
 
 import java.util.Map;
 import java.util.UUID;

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

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.ui.webserver;
+package main.java.com.djrapitops.plan.systems.webserver;
 
 import com.djrapitops.plugin.utilities.Verify;
 import com.sun.net.httpserver.*;
@@ -6,20 +6,20 @@ import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.Settings;
 import main.java.com.djrapitops.plan.data.WebUser;
-import main.java.com.djrapitops.plan.data.cache.PageCacheHandler;
 import main.java.com.djrapitops.plan.database.tables.SecurityTable;
 import main.java.com.djrapitops.plan.locale.Locale;
 import main.java.com.djrapitops.plan.locale.Msg;
+import main.java.com.djrapitops.plan.systems.cache.PageCacheHandler;
+import main.java.com.djrapitops.plan.systems.webapi.WebAPI;
+import main.java.com.djrapitops.plan.systems.webapi.WebAPIManager;
+import main.java.com.djrapitops.plan.systems.webserver.response.*;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.JsonResponse;
 import main.java.com.djrapitops.plan.ui.html.DataRequestHandler;
-import main.java.com.djrapitops.plan.ui.webserver.response.*;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.BadRequestResponse;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.JsonResponse;
 import main.java.com.djrapitops.plan.utilities.Benchmark;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.PassEncryptUtil;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility;
-import main.java.com.djrapitops.plan.utilities.webserver.api.WebAPI;
-import main.java.com.djrapitops.plan.utilities.webserver.api.WebAPIManager;
 import org.bukkit.ChatColor;
 
 import javax.net.ssl.*;

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

@@ -1,7 +1,7 @@
-package main.java.com.djrapitops.plan.ui.webserver.response;
+package main.java.com.djrapitops.plan.systems.webserver.response;
 
+import main.java.com.djrapitops.plan.systems.webserver.theme.Theme;
 import main.java.com.djrapitops.plan.ui.html.DataRequestHandler;
-import main.java.com.djrapitops.plan.ui.theme.Theme;
 
 /**
  * @author Rsl1122

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

@@ -1,6 +1,6 @@
-package main.java.com.djrapitops.plan.ui.webserver.response;
+package main.java.com.djrapitops.plan.systems.webserver.response;
 
-import main.java.com.djrapitops.plan.ui.theme.Theme;
+import main.java.com.djrapitops.plan.systems.webserver.theme.Theme;
 
 /**
  * @author Rsl1122

Plan/src/main/java/com/djrapitops/plan/systems/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 main.java.com.djrapitops.plan.ui.webserver.response;
+package main.java.com.djrapitops.plan.systems.webserver.response;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.utilities.file.FileUtil;

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

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

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

@@ -1,7 +1,7 @@
-package main.java.com.djrapitops.plan.ui.webserver.response;
+package main.java.com.djrapitops.plan.systems.webserver.response;
 
+import main.java.com.djrapitops.plan.systems.webserver.theme.Theme;
 import main.java.com.djrapitops.plan.ui.html.DataRequestHandler;
-import main.java.com.djrapitops.plan.ui.theme.Theme;
 
 import java.util.UUID;
 

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

@@ -1,6 +1,6 @@
-package main.java.com.djrapitops.plan.ui.webserver.response;
+package main.java.com.djrapitops.plan.systems.webserver.response;
 
-import main.java.com.djrapitops.plan.ui.html.Html;
+import main.java.com.djrapitops.plan.utilities.html.Html;
 
 /**
  * @author Rsl1122

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

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

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

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

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

@@ -1,10 +1,10 @@
-package main.java.com.djrapitops.plan.ui.webserver.response;
+package main.java.com.djrapitops.plan.systems.webserver.response;
 
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.UserInfo;
-import main.java.com.djrapitops.plan.ui.html.Html;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.comparators.UserDataNameComparator;
+import main.java.com.djrapitops.plan.utilities.html.Html;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 
 import java.util.List;
 

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

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

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

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

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

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

Plan/src/main/java/com/djrapitops/plan/systems/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 main.java.com.djrapitops.plan.ui.webserver.response.api;
+package main.java.com.djrapitops.plan.systems.webserver.response.api;
 
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
 
 /**
  * @author Fuzzlemann

Plan/src/main/java/com/djrapitops/plan/systems/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 main.java.com.djrapitops.plan.ui.webserver.response.api;
+package main.java.com.djrapitops.plan.systems.webserver.response.api;
 
 import com.google.gson.Gson;
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
 
 /**
  * @author Fuzzlemann

Plan/src/main/java/com/djrapitops/plan/systems/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 main.java.com.djrapitops.plan.ui.webserver.response.api;
+package main.java.com.djrapitops.plan.systems.webserver.response.api;
 
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
 
 /**
  * @author Fuzzlemann

Plan/src/main/java/com/djrapitops/plan/systems/webserver/theme/Colors.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 main.java.com.djrapitops.plan.ui.theme;
+package main.java.com.djrapitops.plan.systems.webserver.theme;
 
 import main.java.com.djrapitops.plan.Log;
 import main.java.com.djrapitops.plan.Settings;

Plan/src/main/java/com/djrapitops/plan/systems/webserver/theme/Theme.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 main.java.com.djrapitops.plan.ui.theme;
+package main.java.com.djrapitops.plan.systems.webserver.theme;
 
 import main.java.com.djrapitops.plan.Log;
 

Plan/src/main/java/com/djrapitops/plan/ui/webserver/api/bukkit/InspectionWebAPI.java

@@ -5,9 +5,9 @@
 package main.java.com.djrapitops.plan.ui.webserver.api.bukkit;
 
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.BadRequestResponse;
-import main.java.com.djrapitops.plan.utilities.webserver.api.WebAPI;
+import main.java.com.djrapitops.plan.systems.webapi.WebAPI;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse;
 
 import java.util.Map;
 

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

@@ -4,6 +4,7 @@ import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.Settings;
 import main.java.com.djrapitops.plan.data.AnalysisData;
 import main.java.com.djrapitops.plan.data.UserInfo;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 
 import java.io.Serializable;
 import java.util.HashMap;

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

@@ -11,17 +11,17 @@ import main.java.com.djrapitops.plan.data.additional.HookHandler;
 import main.java.com.djrapitops.plan.data.additional.PluginData;
 import main.java.com.djrapitops.plan.data.analysis.*;
 import main.java.com.djrapitops.plan.data.cache.AnalysisCacheHandler;
-import main.java.com.djrapitops.plan.data.cache.DataCache;
-import main.java.com.djrapitops.plan.data.cache.PageCacheHandler;
 import main.java.com.djrapitops.plan.database.Database;
 import main.java.com.djrapitops.plan.locale.Locale;
 import main.java.com.djrapitops.plan.locale.Msg;
-import main.java.com.djrapitops.plan.ui.webserver.response.AnalysisPageResponse;
-import main.java.com.djrapitops.plan.ui.webserver.response.PlayersPageResponse;
-import main.java.com.djrapitops.plan.ui.webserver.response.api.JsonResponse;
+import main.java.com.djrapitops.plan.systems.cache.DataCache;
+import main.java.com.djrapitops.plan.systems.cache.PageCacheHandler;
+import main.java.com.djrapitops.plan.systems.webserver.response.AnalysisPageResponse;
+import main.java.com.djrapitops.plan.systems.webserver.response.PlayersPageResponse;
+import main.java.com.djrapitops.plan.systems.webserver.response.api.JsonResponse;
 import main.java.com.djrapitops.plan.utilities.Benchmark;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 
 import java.io.Serializable;
 import java.util.*;

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

@@ -5,10 +5,10 @@ import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.Settings;
 import main.java.com.djrapitops.plan.data.AnalysisData;
 import main.java.com.djrapitops.plan.data.UserInfo;
-import main.java.com.djrapitops.plan.ui.webserver.response.PlayersPageResponse;
+import main.java.com.djrapitops.plan.systems.webserver.response.PlayersPageResponse;
 import main.java.com.djrapitops.plan.utilities.Benchmark;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.PlaceholderUtils;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;

Plan/src/main/java/com/djrapitops/plan/utilities/html/Html.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.ui.html;
+package main.java.com.djrapitops.plan.utilities.html;
 
 import com.djrapitops.plugin.utilities.Verify;
 import org.apache.commons.lang.text.StrSubstitutor;

Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlUtils.java

@@ -1,11 +1,10 @@
-package main.java.com.djrapitops.plan.utilities;
+package main.java.com.djrapitops.plan.utilities.html;
 
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.Settings;
 import main.java.com.djrapitops.plan.locale.Locale;
 import main.java.com.djrapitops.plan.locale.Msg;
-import main.java.com.djrapitops.plan.ui.html.Html;
-import main.java.com.djrapitops.plan.ui.webserver.WebServer;
+import main.java.com.djrapitops.plan.systems.webserver.WebServer;
 import main.java.com.djrapitops.plan.utilities.file.FileUtil;
 import org.apache.commons.lang.text.StrSubstitutor;
 

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/CPUGraphCreator.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import main.java.com.djrapitops.plan.data.TPS;
 import main.java.com.djrapitops.plan.utilities.analysis.Point;

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PlayerActivityGraphCreator.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import main.java.com.djrapitops.plan.data.Session;
 import main.java.com.djrapitops.plan.data.TPS;

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraphCreator.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import main.java.com.djrapitops.plan.data.Session;
 import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils;

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/RamGraphCreator.java

@@ -1,6 +1,7 @@
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import main.java.com.djrapitops.plan.data.TPS;
+import main.java.com.djrapitops.plan.systems.tasks.TPSCountTimer;
 import main.java.com.djrapitops.plan.utilities.analysis.Point;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.stream.Collectors;
  * Class for creating scatter graph data from RAM Usage snapshots with TPS task.
  *
  * @author Rsl1122
- * @see main.java.com.djrapitops.plan.data.listeners.TPSCountTimer
+ * @see TPSCountTimer
  * @since 3.6.0
  */
 public class RamGraphCreator {

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/SeriesCreator.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import main.java.com.djrapitops.plan.utilities.analysis.DouglasPeuckerAlgorithm;
 import main.java.com.djrapitops.plan.utilities.analysis.Point;

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/SessionLengthDistributionGraphCreator.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import java.util.*;
 import java.util.stream.Collectors;

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/TPSGraphCreator.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import main.java.com.djrapitops.plan.data.TPS;
 import main.java.com.djrapitops.plan.utilities.analysis.Point;

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldLoadGraphCreator.java

@@ -1,6 +1,7 @@
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import main.java.com.djrapitops.plan.data.TPS;
+import main.java.com.djrapitops.plan.systems.tasks.TPSCountTimer;
 import main.java.com.djrapitops.plan.utilities.analysis.Point;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.stream.Collectors;
  * Class for creating scatter graph data from Chunk & Entity load snapshots with TPS task.
  *
  * @author Rsl1122
- * @see main.java.com.djrapitops.plan.data.listeners.TPSCountTimer
+ * @see TPSCountTimer
  * @since 3.6.0
  */
 public class WorldLoadGraphCreator {

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMapCreator.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import java.util.Map;
 

Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldPieCreator.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.ui.html.graphs;
+package main.java.com.djrapitops.plan.utilities.html.graphs;
 
 import java.util.Map;
 

Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/CommandUseTableCreator.java

@@ -1,8 +1,8 @@
-package main.java.com.djrapitops.plan.ui.html.tables;
+package main.java.com.djrapitops.plan.utilities.html.tables;
 
 import main.java.com.djrapitops.plan.Log;
-import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.comparators.MapComparator;
+import main.java.com.djrapitops.plan.utilities.html.Html;
 
 import java.util.Collections;
 import java.util.List;

Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/KillsTableCreator.java

@@ -1,14 +1,14 @@
-package main.java.com.djrapitops.plan.ui.html.tables;
+package main.java.com.djrapitops.plan.utilities.html.tables;
 
 import com.djrapitops.plugin.utilities.player.Fetch;
 import com.djrapitops.plugin.utilities.player.IOfflinePlayer;
 import main.java.com.djrapitops.plan.data.KillData;
 import main.java.com.djrapitops.plan.locale.Locale;
 import main.java.com.djrapitops.plan.locale.Msg;
-import main.java.com.djrapitops.plan.ui.html.Html;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
-import main.java.com.djrapitops.plan.utilities.HtmlUtils;
 import main.java.com.djrapitops.plan.utilities.comparators.KillDataComparator;
+import main.java.com.djrapitops.plan.utilities.html.Html;
+import main.java.com.djrapitops.plan.utilities.html.HtmlUtils;
 
 import java.util.Collections;
 import java.util.List;

Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/PlayersTableCreator.java

@@ -1,4 +1,4 @@
-package main.java.com.djrapitops.plan.ui.html.tables;
+package main.java.com.djrapitops.plan.utilities.html.tables;
 
 import main.java.com.djrapitops.plan.data.UserInfo;
 import main.java.com.djrapitops.plan.utilities.MiscUtils;

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

@@ -5,8 +5,8 @@
  */
 package test.java.main.java.com.djrapitops.plan.data.cache;
 
-import main.java.com.djrapitops.plan.data.cache.DataCache;
 import main.java.com.djrapitops.plan.database.Database;
+import main.java.com.djrapitops.plan.systems.cache.DataCache;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.junit.After;
 import org.junit.Before;

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

@@ -1,6 +1,6 @@
 package test.java.main.java.com.djrapitops.plan.data.cache;
 
-import main.java.com.djrapitops.plan.data.cache.GeolocationCacheHandler;
+import main.java.com.djrapitops.plan.systems.cache.GeolocationCacheHandler;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.junit.Before;
 import org.junit.Test;

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

@@ -1,8 +1,8 @@
 package test.java.main.java.com.djrapitops.plan.data.cache;
 
-import main.java.com.djrapitops.plan.data.cache.PageCacheHandler;
-import main.java.com.djrapitops.plan.data.cache.PageLoader;
-import main.java.com.djrapitops.plan.ui.webserver.response.Response;
+import main.java.com.djrapitops.plan.systems.cache.PageCacheHandler;
+import main.java.com.djrapitops.plan.systems.cache.PageLoader;
+import main.java.com.djrapitops.plan.systems.webserver.response.Response;
 import org.junit.Test;
 import test.java.utils.RandomData;