diff --git a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java
index 09c5843cc..52bda2fc0 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/AnalyzeCommand.java
+++ b/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.single.OptionalFetchQueries;
+import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.InfoSystem;
 import com.djrapitops.plan.system.info.connection.ConnectionSystem;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageUninstalledCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageUninstalledCommand.java
index de0f85f63..8ea91a02b 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageUninstalledCommand.java
+++ b/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.single.OptionalFetchQueries;
+import com.djrapitops.plan.db.sql.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;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebListUsersCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebListUsersCommand.java
index fbdabd4bb..42b4abc9a 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebListUsersCommand.java
+++ b/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.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.CmdHelpLang;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPAnonPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPAnonPatch.java
index 969487971..85f71e518 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPAnonPatch.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/IPAnonPatch.java
@@ -22,7 +22,7 @@ import com.djrapitops.plan.data.container.GeoInfo;
 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.sql.queries.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plan.db.sql.tables.GeoInfoTable;
 
 import java.net.InetAddress;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/batch/LargeFetchQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/LargeFetchQueries.java
similarity index 99%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/batch/LargeFetchQueries.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/LargeFetchQueries.java
index 6221eabe0..895f35163 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/batch/LargeFetchQueries.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/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.batch;
+package com.djrapitops.plan.db.sql.queries;
 
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.data.container.*;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/single/OptionalFetchQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/OptionalFetchQueries.java
similarity index 98%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/single/OptionalFetchQueries.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/OptionalFetchQueries.java
index 748468d4a..75e49b127 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/single/OptionalFetchQueries.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/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.single;
+package com.djrapitops.plan.db.sql.queries;
 
 import com.djrapitops.plan.db.access.Query;
 import com.djrapitops.plan.db.access.QueryStatement;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java
index b1719778e..0e5c6a528 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/GeoInfoTable.java
@@ -26,7 +26,7 @@ import com.djrapitops.plan.db.sql.parsing.Column;
 import com.djrapitops.plan.db.sql.parsing.Select;
 import com.djrapitops.plan.db.sql.parsing.Sql;
 import com.djrapitops.plan.db.sql.parsing.TableSqlParser;
-import com.djrapitops.plan.db.sql.queries.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plan.utilities.comparators.GeoInfoComparator;
 import com.djrapitops.plugin.utilities.Verify;
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java
index dfcdc5848..1af124c69 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/KillsTable.java
@@ -30,7 +30,7 @@ import com.djrapitops.plan.db.patches.Version10Patch;
 import com.djrapitops.plan.db.sql.parsing.Column;
 import com.djrapitops.plan.db.sql.parsing.Sql;
 import com.djrapitops.plan.db.sql.parsing.TableSqlParser;
-import com.djrapitops.plan.db.sql.queries.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plugin.utilities.Verify;
 
 import java.sql.PreparedStatement;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SessionsTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SessionsTable.java
index ccd8690b8..c288ce3af 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SessionsTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/SessionsTable.java
@@ -30,7 +30,7 @@ import com.djrapitops.plan.db.sql.parsing.Column;
 import com.djrapitops.plan.db.sql.parsing.Select;
 import com.djrapitops.plan.db.sql.parsing.Sql;
 import com.djrapitops.plan.db.sql.parsing.TableSqlParser;
-import com.djrapitops.plan.db.sql.queries.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plugin.utilities.Verify;
 
 import java.sql.PreparedStatement;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/TPSTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/TPSTable.java
index fc6b45964..8aedd7840 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/TPSTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/TPSTable.java
@@ -27,7 +27,7 @@ import com.djrapitops.plan.db.sql.parsing.Column;
 import com.djrapitops.plan.db.sql.parsing.Select;
 import com.djrapitops.plan.db.sql.parsing.Sql;
 import com.djrapitops.plan.db.sql.parsing.TableSqlParser;
-import com.djrapitops.plan.db.sql.queries.single.OptionalFetchQueries;
+import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.info.server.Server;
 import com.djrapitops.plugin.api.TimeAmount;
 import com.djrapitops.plugin.utilities.Verify;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/move/BatchOperationTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/move/BatchOperationTable.java
index f7fdcbe54..ed1059eca 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/move/BatchOperationTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/move/BatchOperationTable.java
@@ -17,7 +17,7 @@
 package com.djrapitops.plan.db.sql.tables.move;
 
 import com.djrapitops.plan.db.SQLDB;
-import com.djrapitops.plan.db.sql.queries.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plan.db.sql.tables.Table;
 import com.djrapitops.plan.db.sql.tables.UsersTable;
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
index ce7f7130d..b22fd4d4a 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
@@ -27,8 +27,8 @@ 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.db.sql.queries.batch.LargeFetchQueries;
-import com.djrapitops.plan.db.sql.queries.single.OptionalFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
 import com.djrapitops.plan.system.cache.SessionCache;
 import com.djrapitops.plan.system.database.databases.operation.FetchOperations;
 import com.djrapitops.plan.system.info.server.Server;
@@ -136,8 +136,8 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
         Map<UUID, List<Session>> sessions = sessionsTable.getSessionInfoOfServer(serverUUID);
         Map<UUID, Map<UUID, List<Session>>> map = new HashMap<>();
         map.put(serverUUID, sessions);
-        killsTable.addKillsToSessions(map);
-        worldTimesTable.addWorldTimesToSessions(map);
+        killsTable.addKillsToSessions(map); // TODO Optimize
+        worldTimesTable.addWorldTimesToSessions(map); // TODO Optimize
 
         Map<UUID, List<UserInfo>> serverUserInfos = Collections.singletonMap(serverUUID, serverUserInfo);
         Map<UUID, Map<UUID, List<Session>>> serverSessions = Collections.singletonMap(serverUUID, sessions);
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java b/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java
index 74484da20..d202c9cbd 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/export/HtmlExport.java
+++ b/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.UserInfo;
-import com.djrapitops.plan.db.sql.queries.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.file.PlanFiles;
 import com.djrapitops.plan.system.info.connection.ConnectionSystem;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ProxyConnectionSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ProxyConnectionSystem.java
index b15eb3833..45c6e3c5d 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ProxyConnectionSystem.java
+++ b/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.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.InfoSystem;
 import com.djrapitops.plan.system.info.request.*;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java
index 95cf41b63..d39937824 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java
+++ b/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.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plan.system.database.DBSystem;
 import com.djrapitops.plan.system.info.InfoSystem;
 import com.djrapitops.plan.system.info.request.*;
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
index 0ad78b12d..a61c2741b 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
+++ b/Plan/common/src/test/java/com/djrapitops/plan/db/CommonDBTest.java
@@ -30,7 +30,7 @@ import com.djrapitops.plan.data.time.GMTimes;
 import com.djrapitops.plan.data.time.WorldTimes;
 import com.djrapitops.plan.db.access.Query;
 import com.djrapitops.plan.db.patches.Patch;
-import com.djrapitops.plan.db.sql.queries.batch.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
 import com.djrapitops.plan.db.sql.tables.*;
 import com.djrapitops.plan.db.tasks.CreateIndexTask;
 import com.djrapitops.plan.system.PlanSystem;
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/SQLiteTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/SQLiteTest.java
index 0e45c0dfc..614192e3f 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/db/SQLiteTest.java
+++ b/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.batch.LargeFetchQueries;
-import com.djrapitops.plan.db.sql.queries.single.OptionalFetchQueries;
+import com.djrapitops.plan.db.sql.queries.LargeFetchQueries;
+import com.djrapitops.plan.db.sql.queries.OptionalFetchQueries;
 import com.djrapitops.plan.db.sql.tables.ServerTable;
 import com.djrapitops.plan.system.info.server.Server;
 import org.junit.BeforeClass;