Moved db.sql.queries to db.access.queries

Plan/common/src/main/java/com/djrapitops/plan/api/CommonAPI.java

@@ -20,7 +20,7 @@ import com.djrapitops.plan.api.data.PlayerContainer;
 import com.djrapitops.plan.api.data.ServerContainer;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
 import com.djrapitops.plan.db.access.Query;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
+import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.utilities.uuid.UUIDUtility;
 import com.djrapitops.plugin.logging.L;
 import com.djrapitops.plugin.logging.error.ErrorHandler;

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

@@ -18,7 +18,7 @@ package com.djrapitops.plan.command.commands;
 
 import com.djrapitops.plan.api.exceptions.connection.WebException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.InfoSystem;
 import com.djrapitops.plan.system.info.connection.ConnectionSystem;

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

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.command.commands;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.connection.ConnectionSystem;
 import com.djrapitops.plan.system.locale.Locale;

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

@@ -24,7 +24,7 @@ import com.djrapitops.plan.data.store.mutators.ActivityIndex;
 import com.djrapitops.plan.data.store.mutators.GeoInfoMutator;
 import com.djrapitops.plan.data.store.mutators.SessionsMutator;
 import com.djrapitops.plan.data.store.objects.DateHolder;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
+import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 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/RegisterCommand.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.command.commands;
 
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.db.Database;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 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/manage/ManageBackupCommand.java

@@ -21,8 +21,8 @@ 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.db.access.queries.AggregateQueries;
 import com.djrapitops.plan.db.access.transactions.BackupCopyTransaction;
-import com.djrapitops.plan.db.sql.queries.AggregateQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 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/manage/ManageUninstalledCommand.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.command.commands.manage;
 
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.server.Server;
 import com.djrapitops.plan.system.info.server.ServerInfo;

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

@@ -18,7 +18,7 @@ package com.djrapitops.plan.command.commands.webuser;
 
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.db.Database;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 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/WebDeleteCommand.java

@@ -18,7 +18,7 @@ package com.djrapitops.plan.command.commands.webuser;
 
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.db.Database;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 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/WebListUsersCommand.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.command.commands.webuser;
 
 import com.djrapitops.plan.data.WebUser;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;

Plan/common/src/main/java/com/djrapitops/plan/data/store/containers/NetworkContainer.java

@@ -23,7 +23,7 @@ import com.djrapitops.plan.data.store.keys.ServerKeys;
 import com.djrapitops.plan.data.store.mutators.PlayersMutator;
 import com.djrapitops.plan.data.store.mutators.TPSMutator;
 import com.djrapitops.plan.data.store.mutators.health.NetworkHealthInformation;
-import com.djrapitops.plan.db.sql.queries.AggregateQueries;
+import com.djrapitops.plan.db.access.queries.AggregateQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.server.Server;
 import com.djrapitops.plan.system.info.server.properties.ServerProperties;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/AggregateQueries.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.db.sql.queries;
+package com.djrapitops.plan.db.access.queries;
 
 import com.djrapitops.plan.data.time.GMTimes;
 import com.djrapitops.plan.data.time.WorldTimes;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/DataStoreQueries.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.db.sql.queries;
+package com.djrapitops.plan.db.access.queries;
 
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.store.keys.SessionKeys;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/LargeFetchQueries.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.db.sql.queries;
+package com.djrapitops.plan.db.access.queries;
 
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.data.container.*;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/LargeStoreQueries.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.db.sql.queries;
+package com.djrapitops.plan.db.access.queries;
 
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.data.container.*;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/OptionalFetchQueries.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.db.sql.queries;
+package com.djrapitops.plan.db.access.queries;
 
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.data.store.objects.DateObj;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/AllPlayerContainersQuery.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.db.sql.queries.containers;
+package com.djrapitops.plan.db.access.queries.containers;
 
 import com.djrapitops.plan.data.container.*;
 import com.djrapitops.plan.data.store.containers.DataContainer;
@@ -27,7 +27,7 @@ import com.djrapitops.plan.data.store.mutators.SessionsMutator;
 import com.djrapitops.plan.data.store.objects.Nickname;
 import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.Query;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 
 import java.util.*;
 

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/ContainerFetchQueries.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.db.sql.queries.containers;
+package com.djrapitops.plan.db.access.queries.containers;
 
 import com.djrapitops.plan.data.store.containers.NetworkContainer;
 import com.djrapitops.plan.data.store.containers.PlayerContainer;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/NetworkContainerQuery.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.db.sql.queries.containers;
+package com.djrapitops.plan.db.access.queries.containers;
 
 import com.djrapitops.plan.data.store.containers.NetworkContainer;
 import com.djrapitops.plan.data.store.containers.ServerContainer;
@@ -22,8 +22,8 @@ import com.djrapitops.plan.data.store.keys.NetworkKeys;
 import com.djrapitops.plan.data.store.keys.ServerKeys;
 import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.Query;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.info.server.Server;
 
 import java.util.Optional;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/PlayerContainerQuery.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.db.sql.queries.containers;
+package com.djrapitops.plan.db.access.queries.containers;
 
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.container.UserInfo;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/ServerContainerQuery.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.db.sql.queries.containers;
+package com.djrapitops.plan.db.access.queries.containers;
 
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.data.store.containers.ServerContainer;
@@ -23,8 +23,8 @@ import com.djrapitops.plan.data.store.mutators.PlayersMutator;
 import com.djrapitops.plan.data.store.mutators.SessionsMutator;
 import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.Query;
-import com.djrapitops.plan.db.sql.queries.AggregateQueries;
+import com.djrapitops.plan.db.access.queries.AggregateQueries;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.cache.SessionCache;
 import com.djrapitops.plan.system.info.server.Server;
 

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/containers/ServerPlayerContainersQuery.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.db.sql.queries.containers;
+package com.djrapitops.plan.db.access.queries.containers;
 
 import com.djrapitops.plan.data.container.GeoInfo;
 import com.djrapitops.plan.data.container.Ping;
@@ -30,7 +30,7 @@ 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.db.access.Query;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 
 import java.util.*;
 

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/schema/H2SchemaQueries.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.db.sql.queries.schema;
+package com.djrapitops.plan.db.access.queries.schema;
 
 import com.djrapitops.plan.db.access.HasMoreThanZeroQueryStatement;
 import com.djrapitops.plan.db.access.Query;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/schema/MySQLSchemaQueries.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.db.sql.queries.schema;
+package com.djrapitops.plan.db.access.queries.schema;
 
 import com.djrapitops.plan.db.access.HasMoreThanZeroQueryStatement;
 import com.djrapitops.plan.db.access.Query;

Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/schema/SQLiteSchemaQueries.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.db.sql.queries.schema;
+package com.djrapitops.plan.db.access.queries.schema;
 
 import com.djrapitops.plan.db.access.HasMoreThanZeroQueryStatement;
 import com.djrapitops.plan.db.access.Query;

Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/BackupCopyTransaction.java

@@ -19,8 +19,8 @@ package com.djrapitops.plan.db.access.transactions;
 import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.db.access.Executable;
 import com.djrapitops.plan.db.access.Query;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
-import com.djrapitops.plan.db.sql.queries.LargeStoreQueries;
+import com.djrapitops.plan.db.access.queries.LargeStoreQueries;
 
 import java.util.function.Function;
 

Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CleanTransaction.java

@@ -19,7 +19,7 @@ package com.djrapitops.plan.db.access.transactions;
 import com.djrapitops.plan.data.store.objects.DateObj;
 import com.djrapitops.plan.db.access.ExecStatement;
 import com.djrapitops.plan.db.access.Executable;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.db.sql.tables.PingTable;
 import com.djrapitops.plan.db.sql.tables.TPSTable;
 import com.djrapitops.plan.system.locale.Locale;

Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CreateIndexTransaction.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.db.access.transactions;
 
 import com.djrapitops.plan.db.DBType;
-import com.djrapitops.plan.db.sql.queries.schema.MySQLSchemaQueries;
+import com.djrapitops.plan.db.access.queries.schema.MySQLSchemaQueries;
 import com.djrapitops.plan.db.sql.tables.*;
 import org.apache.commons.text.TextStringBuilder;
 

Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemovePlayerTransaction.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.db.access.transactions;
 
 import com.djrapitops.plan.db.access.ExecStatement;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.db.sql.tables.*;
 
 import java.sql.PreparedStatement;

Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/events/CommandStoreTransaction.java

@@ -16,8 +16,8 @@
  */
 package com.djrapitops.plan.db.access.transactions.events;
 
+import com.djrapitops.plan.db.access.queries.DataStoreQueries;
 import com.djrapitops.plan.db.access.transactions.Transaction;
-import com.djrapitops.plan.db.sql.queries.DataStoreQueries;
 
 import java.util.UUID;
 

Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPAnonPatch.java

@@ -20,7 +20,7 @@ import com.djrapitops.plan.data.container.GeoInfo;
 import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.ExecBatchStatement;
 import com.djrapitops.plan.db.access.QueryStatement;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 import com.djrapitops.plan.db.sql.tables.GeoInfoTable;
 
 import java.net.InetAddress;

Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java

@@ -19,11 +19,11 @@ package com.djrapitops.plan.db.patches;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
 import com.djrapitops.plan.db.DBType;
 import com.djrapitops.plan.db.SQLDB;
+import com.djrapitops.plan.db.access.queries.schema.H2SchemaQueries;
+import com.djrapitops.plan.db.access.queries.schema.MySQLSchemaQueries;
+import com.djrapitops.plan.db.access.queries.schema.SQLiteSchemaQueries;
 import com.djrapitops.plan.db.access.transactions.OperationCriticalTransaction;
 import com.djrapitops.plan.db.sql.parsing.TableSqlParser;
-import com.djrapitops.plan.db.sql.queries.schema.H2SchemaQueries;
-import com.djrapitops.plan.db.sql.queries.schema.MySQLSchemaQueries;
-import com.djrapitops.plan.db.sql.queries.schema.SQLiteSchemaQueries;
 import com.djrapitops.plugin.utilities.Verify;
 
 import java.util.List;

Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java

@@ -21,11 +21,11 @@ import com.djrapitops.plan.db.DBType;
 import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.ExecStatement;
 import com.djrapitops.plan.db.access.QueryStatement;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 import com.djrapitops.plan.db.patches.*;
 import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
 import com.djrapitops.plan.db.sql.parsing.Select;
 import com.djrapitops.plan.db.sql.parsing.Sql;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plan.utilities.comparators.GeoInfoComparator;
 
 import java.sql.PreparedStatement;

Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java

@@ -23,12 +23,12 @@ import com.djrapitops.plan.data.store.keys.SessionKeys;
 import com.djrapitops.plan.db.DBType;
 import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.QueryStatement;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 import com.djrapitops.plan.db.patches.KillsOptimizationPatch;
 import com.djrapitops.plan.db.patches.KillsServerIDPatch;
 import com.djrapitops.plan.db.patches.Version10Patch;
 import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
 import com.djrapitops.plan.db.sql.parsing.Sql;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/TPSTable.java

@@ -23,10 +23,10 @@ import com.djrapitops.plan.db.SQLDB;
 import com.djrapitops.plan.db.access.ExecStatement;
 import com.djrapitops.plan.db.access.QueryAllStatement;
 import com.djrapitops.plan.db.access.QueryStatement;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
 import com.djrapitops.plan.db.sql.parsing.Select;
 import com.djrapitops.plan.db.sql.parsing.Sql;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.info.server.Server;
 import com.djrapitops.plugin.api.TimeAmount;
 import org.apache.commons.text.TextStringBuilder;

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

@@ -25,10 +25,10 @@ import com.djrapitops.plan.data.store.containers.NetworkContainer;
 import com.djrapitops.plan.data.store.containers.PlayerContainer;
 import com.djrapitops.plan.data.store.containers.ServerContainer;
 import com.djrapitops.plan.db.SQLDB;
-import com.djrapitops.plan.db.sql.queries.AggregateQueries;
+import com.djrapitops.plan.db.access.queries.AggregateQueries;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
+import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.system.database.databases.operation.FetchOperations;
 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/SQLSaveOps.java

@@ -20,9 +20,9 @@ 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.db.access.queries.DataStoreQueries;
+import com.djrapitops.plan.db.access.queries.LargeStoreQueries;
 import com.djrapitops.plan.db.access.transactions.Transaction;
-import com.djrapitops.plan.db.sql.queries.DataStoreQueries;
-import com.djrapitops.plan.db.sql.queries.LargeStoreQueries;
 import com.djrapitops.plan.system.database.databases.operation.SaveOperations;
 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/export/HtmlExport.java

@@ -20,7 +20,7 @@ import com.djrapitops.plan.PlanPlugin;
 import com.djrapitops.plan.api.exceptions.ParseException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
 import com.djrapitops.plan.data.container.BaseUser;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.info.connection.ConnectionSystem;

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

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.info.connection;
 
 import com.djrapitops.plan.api.exceptions.connection.NoServersException;
 import com.djrapitops.plan.api.exceptions.database.DBOpException;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.InfoSystem;
 import com.djrapitops.plan.system.info.request.*;

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

@@ -19,7 +19,7 @@ package com.djrapitops.plan.system.info.connection;
 import com.djrapitops.plan.api.exceptions.connection.ConnectionFailException;
 import com.djrapitops.plan.api.exceptions.connection.NoServersException;
 import com.djrapitops.plan.db.Database;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.InfoSystem;
 import com.djrapitops.plan.system.info.request.*;

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

@@ -21,7 +21,7 @@ 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.db.Database;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.utilities.Base64Util;
 import com.djrapitops.plan.utilities.PassEncryptUtil;
 

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

@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.webserver.response;
 
 import com.djrapitops.plan.api.exceptions.ParseException;
 import com.djrapitops.plan.api.exceptions.WebUserAuthException;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
+import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.locale.Locale;

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

@@ -21,7 +21,7 @@ import com.djrapitops.plan.data.store.containers.AnalysisContainer;
 import com.djrapitops.plan.data.store.containers.NetworkContainer;
 import com.djrapitops.plan.data.store.containers.PlayerContainer;
 import com.djrapitops.plan.db.Database;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
+import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.info.connection.ConnectionSystem;

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

@@ -19,7 +19,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.db.Database;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
+import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
 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

@@ -30,11 +30,11 @@ import com.djrapitops.plan.data.time.GMTimes;
 import com.djrapitops.plan.data.time.WorldTimes;
 import com.djrapitops.plan.db.access.Executable;
 import com.djrapitops.plan.db.access.Query;
+import com.djrapitops.plan.db.access.queries.*;
+import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.db.access.transactions.*;
 import com.djrapitops.plan.db.access.transactions.events.CommandStoreTransaction;
 import com.djrapitops.plan.db.patches.Patch;
-import com.djrapitops.plan.db.sql.queries.*;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.db.sql.tables.*;
 import com.djrapitops.plan.system.PlanSystem;
 import com.djrapitops.plan.system.database.DBSystem;
@@ -223,20 +223,12 @@ public abstract class CommonDBTest {
     }
 
     private void saveUserOne() {
-        saveUserOne(db);
+        db.getUsersTable().registerUser(playerUUID, 123456789L, "Test");
-    }
+        db.getUsersTable().kicked(playerUUID);
-
-    private void saveUserOne(SQLDB database) {
-        database.getUsersTable().registerUser(playerUUID, 123456789L, "Test");
-        database.getUsersTable().kicked(playerUUID);
     }
 
     private void saveUserTwo() {
-        saveUserTwo(db);
+        db.getUsersTable().registerUser(player2UUID, 123456789L, "Test");
-    }
-
-    private void saveUserTwo(SQLDB database) {
-        database.getUsersTable().registerUser(player2UUID, 123456789L, "Test");
     }
 
     @Test
@@ -316,11 +308,7 @@ public abstract class CommonDBTest {
     }
 
     private void saveTwoWorlds() {
-        saveTwoWorlds(db);
+        db.getWorldTable().saveWorlds(worlds);
-    }
-
-    private void saveTwoWorlds(SQLDB database) {
-        database.getWorldTable().saveWorlds(worlds);
     }
 
     private WorldTimes createWorldTimes() {
@@ -532,7 +520,7 @@ public abstract class CommonDBTest {
 
     @Test
     public void testRemovalEverything() throws NoSuchAlgorithmException {
-        saveAllData(db);
+        saveAllData();
 
         db.executeTransaction(new RemoveEverythingTransaction());
 
@@ -553,21 +541,20 @@ public abstract class CommonDBTest {
         assertTrue(database.query(query).isEmpty());
     }
 
-    private void saveAllData(SQLDB database) throws NoSuchAlgorithmException {
+    private void saveAllData() throws NoSuchAlgorithmException {
-        UserInfoTable userInfoTable = database.getUserInfoTable();
+        UserInfoTable userInfoTable = db.getUserInfoTable();
-        UsersTable usersTable = database.getUsersTable();
+        UsersTable usersTable = db.getUsersTable();
-        SessionsTable sessionsTable = database.getSessionsTable();
+        NicknamesTable nicknamesTable = db.getNicknamesTable();
-        NicknamesTable nicknamesTable = database.getNicknamesTable();
+        GeoInfoTable geoInfoTable = db.getGeoInfoTable();
-        GeoInfoTable geoInfoTable = database.getGeoInfoTable();
+        TPSTable tpsTable = db.getTpsTable();
-        TPSTable tpsTable = database.getTpsTable();
+        SecurityTable securityTable = db.getSecurityTable();
-        SecurityTable securityTable = database.getSecurityTable();
+        PingTable pingTable = db.getPingTable();
-        PingTable pingTable = database.getPingTable();
 
-        saveUserOne(database);
+        saveUserOne();
-        saveUserTwo(database);
+        saveUserTwo();
 
         userInfoTable.registerUserInfo(playerUUID, 223456789L);
-        saveTwoWorlds(database);
+        saveTwoWorlds();
 
         Session session = new Session(playerUUID, serverUUID, 12345L, "", "");
         session.endSession(22345L);
@@ -689,7 +676,7 @@ public abstract class CommonDBTest {
         H2DB backup = dbSystem.getH2Factory().usingFile(temporaryFolder.newFile("backup.db"));
         backup.init();
 
-        saveAllData(db);
+        saveAllData();
 
         backup.executeTransaction(new BackupCopyTransaction(db));
 
@@ -804,7 +791,7 @@ public abstract class CommonDBTest {
 
     @Test
     public void testWorldTableGetWorldNamesNoException() throws NoSuchAlgorithmException {
-        saveAllData(db);
+        saveAllData();
         Set<String> worldNames = db.getWorldTable().getWorldNames(serverUUID);
         assertEquals(new HashSet<>(worlds), worldNames);
     }
@@ -837,7 +824,7 @@ public abstract class CommonDBTest {
 
     @Test
     public void testNewContainerForPlayer() throws NoSuchAlgorithmException {
-        saveAllData(db);
+        saveAllData();
 
         long start = System.nanoTime();
 
@@ -892,7 +879,7 @@ public abstract class CommonDBTest {
 
     @Test
     public void playerContainerSupportsAllPlayerKeys() throws NoSuchAlgorithmException, IllegalAccessException {
-        saveAllData(db);
+        saveAllData();
 
         PlayerContainer playerContainer = db.query(ContainerFetchQueries.fetchPlayerContainer(playerUUID));
         // Active sessions are added after fetching
@@ -911,7 +898,7 @@ public abstract class CommonDBTest {
 
     @Test
     public void serverContainerSupportsAllServerKeys() throws NoSuchAlgorithmException, IllegalAccessException {
-        saveAllData(db);
+        saveAllData();
 
         ServerContainer serverContainer = db.query(ContainerFetchQueries.fetchServerContainer(serverUUID));
 

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

@@ -19,10 +19,10 @@ 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.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction;
 import com.djrapitops.plan.db.access.transactions.RemoveEverythingTransaction;
 import com.djrapitops.plan.db.access.transactions.Transaction;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.db.tasks.PatchTask;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.settings.config.PlanConfig;

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

@@ -20,10 +20,10 @@ 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.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction;
 import com.djrapitops.plan.db.access.transactions.RemoveEverythingTransaction;
 import com.djrapitops.plan.db.access.transactions.Transaction;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.db.tasks.PatchTask;
 import com.djrapitops.plan.system.PlanSystem;
 import com.djrapitops.plan.system.locale.Locale;

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

@@ -19,10 +19,10 @@ 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.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.db.access.transactions.CreateTablesTransaction;
 import com.djrapitops.plan.db.access.transactions.RemoveEverythingTransaction;
 import com.djrapitops.plan.db.access.transactions.Transaction;
-import com.djrapitops.plan.db.sql.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.db.tasks.PatchTask;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plugin.logging.L;

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

@@ -17,8 +17,8 @@
 package com.djrapitops.plan.db;
 
 import com.djrapitops.plan.api.exceptions.database.DBInitException;
-import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
-import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.queries.OptionalFetchQueries;
 import com.djrapitops.plan.db.sql.tables.ServerTable;
 import com.djrapitops.plan.system.info.server.Server;
 import org.junit.BeforeClass;

Plan/common/src/test/java/com/djrapitops/plan/system/webserver/JSErrorRegressionTest.java

@@ -18,8 +18,8 @@ package com.djrapitops.plan.system.webserver;
 
 import com.djrapitops.plan.data.container.Session;
 import com.djrapitops.plan.db.Database;
+import com.djrapitops.plan.db.access.queries.DataStoreQueries;
 import com.djrapitops.plan.db.access.transactions.Transaction;
-import com.djrapitops.plan.db.sql.queries.DataStoreQueries;
 import com.djrapitops.plan.system.PlanSystem;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.settings.config.PlanConfig;