Move DBType & Database related classes:

system.database.databases -> db
system.database.databases.sql -> db

- DBType
- Database
- SQLDB
- H2DB
- MySQLDB
- SpongeMySQLDB
- SQLiteDB

Plan/bukkit/src/main/java/com/djrapitops/plan/system/database/BukkitDBSystem.java

@@ -17,9 +17,9 @@
 package com.djrapitops.plan.system.database;
 
 import com.djrapitops.plan.api.exceptions.EnableException;
-import com.djrapitops.plan.system.database.databases.sql.H2DB;
-import com.djrapitops.plan.system.database.databases.sql.MySQLDB;
-import com.djrapitops.plan.system.database.databases.sql.SQLiteDB;
+import com.djrapitops.plan.db.H2DB;
+import com.djrapitops.plan.db.MySQLDB;
+import com.djrapitops.plan.db.SQLiteDB;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.settings.config.PlanConfig;
 import com.djrapitops.plan.system.settings.paths.DatabaseSettings;

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

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan;
 
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.info.connection.ConnectionSystem;
 import org.bstats.bungeecord.Metrics;
 

Plan/bungeecord/src/main/java/com/djrapitops/plan/system/info/server/BungeeServerInfo.java

@@ -18,8 +18,8 @@ package com.djrapitops.plan.system.info.server;
 
 import com.djrapitops.plan.api.exceptions.EnableException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.info.server.properties.ServerProperties;
 import com.djrapitops.plan.system.webserver.WebServer;
 import com.djrapitops.plugin.logging.console.PluginLogger;

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

@@ -21,9 +21,9 @@ import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.store.keys.SessionKeys;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.cache.SessionCache;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plugin.logging.L;
 import com.djrapitops.plugin.logging.error.ErrorHandler;
 

Plan/common/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java

@@ -17,8 +17,8 @@
 package com.djrapitops.plan.command.commands;
 
 import com.djrapitops.plan.data.WebUser;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;
 import com.djrapitops.plan.system.locale.lang.CommandLang;

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

@@ -18,10 +18,10 @@ package com.djrapitops.plan.command.commands.manage;
 
 import com.djrapitops.plan.api.exceptions.database.DBException;
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
+import com.djrapitops.plan.db.DBType;
+import com.djrapitops.plan.db.Database;
+import com.djrapitops.plan.db.SQLiteDB;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.DBType;
-import com.djrapitops.plan.system.database.databases.Database;
-import com.djrapitops.plan.system.database.databases.sql.SQLiteDB;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;
 import com.djrapitops.plan.system.locale.lang.CommandLang;

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

@@ -18,9 +18,9 @@ package com.djrapitops.plan.command.commands.manage;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
+import com.djrapitops.plan.db.DBType;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.DBType;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;
 import com.djrapitops.plan.system.locale.lang.CommandLang;

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

@@ -17,9 +17,9 @@
 package com.djrapitops.plan.command.commands.manage;
 
 import com.djrapitops.plan.PlanPlugin;
+import com.djrapitops.plan.db.DBType;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.DBType;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;
 import com.djrapitops.plan.system.locale.lang.CommandLang;

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

@@ -16,9 +16,9 @@
  */
 package com.djrapitops.plan.command.commands.manage;
 
+import com.djrapitops.plan.db.DBType;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.DBType;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;
 import com.djrapitops.plan.system.locale.lang.CommandLang;

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

@@ -17,8 +17,8 @@
 package com.djrapitops.plan.command.commands.manage;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;
 import com.djrapitops.plan.system.locale.lang.CommandLang;

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

@@ -16,10 +16,10 @@
  */
 package com.djrapitops.plan.command.commands.manage;
 
+import com.djrapitops.plan.db.DBType;
+import com.djrapitops.plan.db.Database;
+import com.djrapitops.plan.db.SQLiteDB;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.DBType;
-import com.djrapitops.plan.system.database.databases.Database;
-import com.djrapitops.plan.system.database.databases.sql.SQLiteDB;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;

Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebCheckCommand.java

@@ -17,8 +17,8 @@
 package com.djrapitops.plan.command.commands.webuser;
 
 import com.djrapitops.plan.data.WebUser;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;
 import com.djrapitops.plan.system.locale.lang.CommandLang;

Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebDeleteCommand.java

@@ -16,8 +16,8 @@
  */
 package com.djrapitops.plan.command.commands.webuser;
 
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;
 import com.djrapitops.plan.system.locale.lang.CommandLang;

Plan/common/src/main/java/com/djrapitops/plan/db/DBType.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases;
+package com.djrapitops.plan.db;
 
 import java.util.Optional;
 

Plan/common/src/main/java/com/djrapitops/plan/db/Database.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBException;
 import com.djrapitops.plan.api.exceptions.database.DBInitException;

Plan/common/src/main/java/com/djrapitops/plan/db/H2DB.java

@@ -14,11 +14,11 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.store.containers.NetworkContainer;
-import com.djrapitops.plan.system.database.databases.DBType;
+import com.djrapitops.plan.system.database.databases.sql.KeepAliveTask;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.info.server.ServerInfo;
 import com.djrapitops.plan.system.locale.Locale;

Plan/common/src/main/java/com/djrapitops/plan/db/MySQLDB.java

@@ -14,12 +14,11 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
 import com.djrapitops.plan.data.store.containers.NetworkContainer;
-import com.djrapitops.plan.system.database.databases.DBType;
 import com.djrapitops.plan.system.info.server.ServerInfo;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.PluginLang;

Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java

@@ -14,13 +14,14 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
 import com.djrapitops.plan.data.store.containers.NetworkContainer;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.database.databases.operation.*;
+import com.djrapitops.plan.system.database.databases.sql.CreateIndexTask;
+import com.djrapitops.plan.system.database.databases.sql.PatchTask;
 import com.djrapitops.plan.system.database.databases.sql.operation.*;
 import com.djrapitops.plan.system.database.databases.sql.patches.*;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;

Plan/common/src/main/java/com/djrapitops/plan/db/SQLiteDB.java

@@ -14,11 +14,11 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.store.containers.NetworkContainer;
-import com.djrapitops.plan.system.database.databases.DBType;
+import com.djrapitops.plan.system.database.databases.sql.KeepAliveTask;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.info.server.ServerInfo;
 import com.djrapitops.plan.system.locale.Locale;

Plan/common/src/main/java/com/djrapitops/plan/system/database/DBSystem.java

@@ -19,10 +19,10 @@ package com.djrapitops.plan.system.database;
 import com.djrapitops.plan.api.exceptions.EnableException;
 import com.djrapitops.plan.api.exceptions.database.DBException;
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
+import com.djrapitops.plan.db.Database;
+import com.djrapitops.plan.db.H2DB;
+import com.djrapitops.plan.db.SQLiteDB;
 import com.djrapitops.plan.system.SubSystem;
-import com.djrapitops.plan.system.database.databases.Database;
-import com.djrapitops.plan.system.database.databases.sql.H2DB;
-import com.djrapitops.plan.system.database.databases.sql.SQLiteDB;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.PluginLang;
 import com.djrapitops.plugin.benchmarking.Timings;

Plan/common/src/main/java/com/djrapitops/plan/system/database/ProxyDBSystem.java

@@ -16,9 +16,9 @@
  */
 package com.djrapitops.plan.system.database;
 
-import com.djrapitops.plan.system.database.databases.sql.H2DB;
-import com.djrapitops.plan.system.database.databases.sql.MySQLDB;
-import com.djrapitops.plan.system.database.databases.sql.SQLiteDB;
+import com.djrapitops.plan.db.H2DB;
+import com.djrapitops.plan.db.MySQLDB;
+import com.djrapitops.plan.db.SQLiteDB;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plugin.benchmarking.Timings;
 import com.djrapitops.plugin.logging.console.PluginLogger;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/operation/BackupOperations.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.operation;
 
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 
 public interface BackupOperations {
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/CreateIndexTask.java

@@ -16,7 +16,8 @@
  */
 package com.djrapitops.plan.system.database.databases.sql;
 
-import com.djrapitops.plan.system.database.databases.DBType;
+import com.djrapitops.plan.db.DBType;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.operation.Queries;
 import com.djrapitops.plan.system.database.databases.sql.statements.Column;
 import com.djrapitops.plan.system.database.databases.sql.tables.*;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLBackupOps.java

@@ -16,9 +16,9 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.operation;
 
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.operation.BackupOperations;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.move.BatchOperationTable;
 
 public class SQLBackupOps extends SQLOps implements BackupOperations {

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLCheckOps.java

@@ -16,8 +16,8 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.operation;
 
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.operation.CheckOperations;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
 
 import java.util.UUID;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLCountOps.java

@@ -16,8 +16,8 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.operation;
 
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.operation.CountOperations;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
 
 import java.util.UUID;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java

@@ -26,9 +26,9 @@ import com.djrapitops.plan.data.store.mutators.SessionsMutator;
 import com.djrapitops.plan.data.store.objects.DateObj;
 import com.djrapitops.plan.data.store.objects.Nickname;
 import com.djrapitops.plan.data.time.WorldTimes;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.cache.SessionCache;
 import com.djrapitops.plan.system.database.databases.operation.FetchOperations;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
 import com.djrapitops.plan.system.info.server.Server;
 import com.djrapitops.plan.system.settings.config.Config;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLOps.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.operation;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.*;
 
 public class SQLOps {

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLRemoveOps.java

@@ -16,8 +16,8 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.operation;
 
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.operation.RemoveOperations;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.Table;
 import com.djrapitops.plan.system.database.databases.sql.tables.UserUUIDTable;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLSaveOps.java

@@ -19,8 +19,8 @@ package com.djrapitops.plan.system.database.databases.sql.operation;
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.data.container.*;
 import com.djrapitops.plan.data.store.objects.Nickname;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.operation.SaveOperations;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
 import com.djrapitops.plan.system.info.server.Server;
 import com.djrapitops.plan.system.settings.config.Config;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLSearchOps.java

@@ -16,8 +16,8 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.operation;
 
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.operation.SearchOperations;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
 
 import java.util.Collections;
 import java.util.List;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/BadAFKThresholdValuePatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.tables.SessionsTable;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/DiskUsagePatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.TPSTable;
 
 public class DiskUsagePatch extends Patch {

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoLastUsedPatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.GeoInfoTable;
 
 public class GeoInfoLastUsedPatch extends Patch {

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/GeoInfoOptimizationPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.GeoInfoTable;
 import com.djrapitops.plan.system.database.databases.sql.tables.GeoInfoTable.Col;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPAnonPatch.java

@@ -19,7 +19,7 @@ package com.djrapitops.plan.system.database.databases.sql.patches;
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
 import com.djrapitops.plan.data.container.GeoInfo;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;
 import com.djrapitops.plan.system.database.databases.sql.tables.GeoInfoTable;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/IPHashPatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.GeoInfoTable;
 
 public class IPHashPatch extends Patch {

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsOptimizationPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.KillsTable;
 import com.djrapitops.plan.system.database.databases.sql.tables.KillsTable.Col;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/KillsServerIDPatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;
 import com.djrapitops.plan.system.database.databases.sql.tables.KillsTable;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknameLastSeenPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.data.store.objects.Nickname;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.statements.Select;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/NicknamesOptimizationPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.NicknamesTable;
 import com.djrapitops.plan.system.database.databases.sql.tables.NicknamesTable.Col;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java

@@ -17,8 +17,8 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.DBType;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.DBType;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.objects.ForeignKeyConstraint;
 import com.djrapitops.plan.system.database.databases.sql.operation.Queries;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/PingOptimizationPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.PingTable;
 import com.djrapitops.plan.system.database.databases.sql.tables.PingTable.Col;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionAFKTimePatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.SessionsTable;
 
 public class SessionAFKTimePatch extends Patch {

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/SessionsOptimizationPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.SessionsTable;
 import com.djrapitops.plan.system.database.databases.sql.tables.SessionsTable.Col;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/TransferTableRemovalPatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 
 public class TransferTableRemovalPatch extends Patch {
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/UserInfoOptimizationPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.UserInfoTable;
 import com.djrapitops.plan.system.database.databases.sql.tables.UserInfoTable.Col;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Version10Patch.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.*;
 
 import java.util.Optional;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/VersionTableRemovalPatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 
 public class VersionTableRemovalPatch extends Patch {
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesOptimizationPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.WorldTimesTable;
 import com.djrapitops.plan.system.database.databases.sql.tables.WorldTimesTable.Col;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldTimesSeverIDPatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;
 import com.djrapitops.plan.system.database.databases.sql.tables.WorldTimesTable;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsOptimizationPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.WorldTable;
 import com.djrapitops.plan.system.database.databases.sql.tables.WorldTable.Col;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/WorldsServerIDPatch.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.patches;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/CommandUseTable.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/GeoInfoTable.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.container.GeoInfo;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/KillsTable.java

@@ -21,7 +21,7 @@ import com.djrapitops.plan.data.container.PlayerDeath;
 import com.djrapitops.plan.data.container.PlayerKill;
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.store.keys.SessionKeys;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/NicknamesTable.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.store.objects.Nickname;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/PingTable.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.container.Ping;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SecurityTable.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.WebUser;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ServerTable.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SessionsTable.java

@@ -19,7 +19,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables;
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.store.keys.SessionKeys;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/SettingsTable.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;
 import com.djrapitops.plan.system.database.databases.sql.statements.Column;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TPSTable.java

@@ -19,7 +19,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables;
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.container.TPS;
 import com.djrapitops.plan.data.container.builders.TPSBuilder;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/Table.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;
 import com.djrapitops.plan.utilities.MiscUtils;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.container.UserInfo;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserUUIDTable.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.database.databases.sql.tables;
 
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.statements.Column;
 

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UsersTable.java

@@ -21,7 +21,7 @@ import com.djrapitops.plan.data.container.UserInfo;
 import com.djrapitops.plan.data.store.Key;
 import com.djrapitops.plan.data.store.containers.DataContainer;
 import com.djrapitops.plan.data.store.keys.PlayerKeys;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTable.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.tables;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/WorldTimesTable.java

@@ -21,7 +21,7 @@ import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.store.keys.SessionKeys;
 import com.djrapitops.plan.data.time.GMTimes;
 import com.djrapitops.plan.data.time.WorldTimes;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.processing.ExecStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryAllStatement;
 import com.djrapitops.plan.system.database.databases.sql.processing.QueryStatement;

Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/move/BatchOperationTable.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.system.database.databases.sql.tables.move;
 
 import com.djrapitops.plan.data.container.UserInfo;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.database.databases.sql.tables.ServerTable;
 import com.djrapitops.plan.system.database.databases.sql.tables.Table;
 import com.djrapitops.plan.system.database.databases.sql.tables.UsersTable;

Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionIn.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.info.connection;
 
 import com.djrapitops.plan.api.exceptions.connection.*;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.info.request.InfoRequest;
 import com.djrapitops.plan.system.info.request.SetupRequest;
 import com.djrapitops.plan.system.webserver.Request;

Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java

@@ -18,8 +18,8 @@ package com.djrapitops.plan.system.info.server;
 
 import com.djrapitops.plan.api.exceptions.EnableException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.info.server.properties.ServerProperties;
 import com.djrapitops.plan.system.settings.config.PlanConfig;
 import com.djrapitops.plan.system.settings.paths.PluginSettings;

Plan/common/src/main/java/com/djrapitops/plan/system/processing/processors/CommandProcessor.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.processing.processors;
 
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.processing.CriticalRunnable;
 
 /**

Plan/common/src/main/java/com/djrapitops/plan/system/processing/processors/TPSInsertProcessor.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.processing.processors;
 
 import com.djrapitops.plan.data.container.TPS;
 import com.djrapitops.plan.data.container.builders.TPSBuilder;
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.processing.CriticalRunnable;
 
 import java.util.List;

Plan/common/src/main/java/com/djrapitops/plan/system/processing/processors/player/BanAndOpProcessor.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.processing.processors.player;
 
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.databases.operation.SaveOperations;
 
 import java.util.UUID;

Plan/common/src/main/java/com/djrapitops/plan/system/processing/processors/player/IPUpdateProcessor.java

@@ -17,8 +17,8 @@
 package com.djrapitops.plan.system.processing.processors.player;
 
 import com.djrapitops.plan.data.container.GeoInfo;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.cache.GeolocationCache;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.processing.CriticalRunnable;
 
 import java.net.InetAddress;

Plan/common/src/main/java/com/djrapitops/plan/system/processing/processors/player/KickProcessor.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.processing.processors.player;
 
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.processing.CriticalRunnable;
 
 import java.util.UUID;

Plan/common/src/main/java/com/djrapitops/plan/system/processing/processors/player/NameProcessor.java

@@ -17,8 +17,8 @@
 package com.djrapitops.plan.system.processing.processors.player;
 
 import com.djrapitops.plan.data.store.objects.Nickname;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.cache.DataCache;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.database.databases.operation.SaveOperations;
 import com.djrapitops.plan.system.processing.CriticalRunnable;
 

Plan/common/src/main/java/com/djrapitops/plan/system/processing/processors/player/PingInsertProcessor.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.processing.processors.player;
 
 import com.djrapitops.plan.data.container.Ping;
 import com.djrapitops.plan.data.store.objects.DateObj;
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.processing.CriticalRunnable;
 import com.djrapitops.plan.utilities.analysis.Median;
 

Plan/common/src/main/java/com/djrapitops/plan/system/processing/processors/player/ProxyRegisterProcessor.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.processing.processors.player;
 
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.processing.CriticalRunnable;
 import com.djrapitops.plan.system.processing.Processing;
 

Plan/common/src/main/java/com/djrapitops/plan/system/processing/processors/player/RegisterProcessor.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.processing.processors.player;
 
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.database.databases.operation.CheckOperations;
 import com.djrapitops.plan.system.database.databases.operation.SaveOperations;
 import com.djrapitops.plan.system.processing.Processing;

Plan/common/src/main/java/com/djrapitops/plan/system/settings/network/NetworkSettingManager.java

@@ -17,9 +17,9 @@
 package com.djrapitops.plan.system.settings.network;
 
 import com.djrapitops.plan.api.exceptions.EnableException;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.SubSystem;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.info.server.ServerInfo;
 import com.djrapitops.plan.system.settings.config.*;

Plan/common/src/main/java/com/djrapitops/plan/system/settings/network/ServerSettingsManager.java

@@ -16,9 +16,9 @@
  */
 package com.djrapitops.plan.system.settings.network;
 
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.SubSystem;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.info.server.ServerInfo;
 import com.djrapitops.plan.system.settings.config.Config;

Plan/common/src/main/java/com/djrapitops/plan/system/settings/paths/DatabaseSettings.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.system.settings.paths;
 
-import com.djrapitops.plan.system.database.databases.DBType;
+import com.djrapitops.plan.db.DBType;
 import com.djrapitops.plan.system.settings.paths.key.Setting;
 import com.djrapitops.plan.system.settings.paths.key.StringSetting;
 import org.apache.commons.lang3.math.NumberUtils;

Plan/common/src/main/java/com/djrapitops/plan/system/webserver/auth/BasicAuthentication.java

@@ -20,7 +20,7 @@ import com.djrapitops.plan.api.exceptions.PassEncryptException;
 import com.djrapitops.plan.api.exceptions.WebUserAuthException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
 import com.djrapitops.plan.data.WebUser;
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.utilities.Base64Util;
 import com.djrapitops.plan.utilities.PassEncryptUtil;
 

Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java

@@ -19,8 +19,8 @@ package com.djrapitops.plan.utilities.html.pages;
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.store.keys.SessionKeys;
 import com.djrapitops.plan.data.store.objects.DateHolder;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.cache.SessionCache;
-import com.djrapitops.plan.system.database.databases.Database;
 import com.djrapitops.plan.system.info.connection.ConnectionLog;
 import com.djrapitops.plan.system.info.connection.ConnectionSystem;
 import com.djrapitops.plan.system.info.server.Server;

Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.utilities.html.pages;
 
 import com.djrapitops.plan.api.exceptions.ParseException;
 import com.djrapitops.plan.data.store.containers.PlayerContainer;
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.info.server.ServerInfo;
 import com.djrapitops.plan.system.settings.config.PlanConfig;

Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.WebUser;
@@ -30,6 +30,7 @@ import com.djrapitops.plan.data.time.GMTimes;
 import com.djrapitops.plan.data.time.WorldTimes;
 import com.djrapitops.plan.system.PlanSystem;
 import com.djrapitops.plan.system.database.DBSystem;
+import com.djrapitops.plan.system.database.databases.sql.CreateIndexTask;
 import com.djrapitops.plan.system.database.databases.sql.patches.Patch;
 import com.djrapitops.plan.system.database.databases.sql.tables.*;
 import com.djrapitops.plan.system.info.server.Server;

Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java

@@ -14,11 +14,12 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.store.containers.ServerContainer;
 import com.djrapitops.plan.data.store.keys.ServerKeys;
+import com.djrapitops.plan.system.database.databases.sql.PatchTask;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.settings.config.PlanConfig;
 import com.djrapitops.plan.system.settings.paths.DatabaseSettings;

Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java

@@ -14,14 +14,14 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.EnableException;
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.store.containers.ServerContainer;
 import com.djrapitops.plan.data.store.keys.ServerKeys;
 import com.djrapitops.plan.system.PlanSystem;
-import com.djrapitops.plan.system.database.databases.DBType;
+import com.djrapitops.plan.system.database.databases.sql.PatchTask;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.settings.config.PlanConfig;
 import com.djrapitops.plan.system.settings.paths.DatabaseSettings;

Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchRegressionTest.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.system.database.databases.sql.patches.Patch;
 import utilities.TestConstants;

Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java

@@ -14,11 +14,12 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.store.containers.ServerContainer;
 import com.djrapitops.plan.data.store.keys.ServerKeys;
+import com.djrapitops.plan.system.database.databases.sql.PatchTask;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plugin.logging.L;
 import com.djrapitops.plugin.logging.console.TestPluginLogger;

Plan/common/src/test/java/com/djrapitops/plan/db/H2Test.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

Plan/common/src/test/java/com/djrapitops/plan/db/MySQLTest.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.system.settings.config.PlanConfig;
 import com.djrapitops.plan.system.settings.paths.DatabaseSettings;
@@ -24,7 +24,7 @@ import utilities.CIProperties;
 import static org.junit.Assume.assumeTrue;
 
 /**
- * Tests for {@link com.djrapitops.plan.system.database.databases.sql.MySQLDB}.
+ * Tests for {@link MySQLDB}.
  * <p>
  * These settings assume Travis CI environment with MySQL service running.
  * 'Plan' database should be created before the test.

Plan/common/src/test/java/com/djrapitops/plan/db/SQLiteTest.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.system.database.databases.sql.tables.ServerTable;

Plan/common/src/test/java/utilities/TestDatabaseCreator.java

@@ -19,7 +19,7 @@ package utilities;
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.time.GMTimes;
 import com.djrapitops.plan.data.time.WorldTimes;
-import com.djrapitops.plan.system.database.databases.sql.SQLDB;
+import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.system.info.server.Server;
 
 import java.io.File;

Plan/common/src/test/java/utilities/dagger/PluginSuperClassBindingModule.java

@@ -18,10 +18,10 @@ package utilities.dagger;
 
 import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.EnableException;
+import com.djrapitops.plan.db.H2DB;
+import com.djrapitops.plan.db.MySQLDB;
+import com.djrapitops.plan.db.SQLiteDB;
 import com.djrapitops.plan.system.database.DBSystem;
-import com.djrapitops.plan.system.database.databases.sql.H2DB;
-import com.djrapitops.plan.system.database.databases.sql.MySQLDB;
-import com.djrapitops.plan.system.database.databases.sql.SQLiteDB;
 import com.djrapitops.plan.system.listeners.ListenerSystem;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.settings.config.PlanConfig;

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

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan;
 
-import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.db.Database;
 import org.bstats.sponge.Metrics;
 
 import java.io.Serializable;

Plan/sponge/src/main/java/com/djrapitops/plan/db/SpongeMySQLDB.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.djrapitops.plan.system.database.databases.sql;
+package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
 import com.djrapitops.plan.data.store.containers.NetworkContainer;

Plan/sponge/src/main/java/com/djrapitops/plan/system/database/SpongeDBSystem.java

@@ -17,9 +17,9 @@
 package com.djrapitops.plan.system.database;
 
 import com.djrapitops.plan.api.exceptions.EnableException;
-import com.djrapitops.plan.system.database.databases.sql.H2DB;
-import com.djrapitops.plan.system.database.databases.sql.SQLiteDB;
-import com.djrapitops.plan.system.database.databases.sql.SpongeMySQLDB;
+import com.djrapitops.plan.db.H2DB;
+import com.djrapitops.plan.db.SQLiteDB;
+import com.djrapitops.plan.db.SpongeMySQLDB;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.settings.config.PlanConfig;
 import com.djrapitops.plan.system.settings.paths.DatabaseSettings;