diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java
index 1ac067a3e..d41fe4a7b 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/Patch.java
@@ -21,9 +21,9 @@ import com.djrapitops.plan.db.DBType;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.access.transactions.Transaction;
import com.djrapitops.plan.db.sql.parsing.TableSqlParser;
-import com.djrapitops.plan.db.sql.queries.H2SchemaQueries;
-import com.djrapitops.plan.db.sql.queries.MySQLSchemaQueries;
-import com.djrapitops.plan.db.sql.queries.SQLiteSchemaQueries;
+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;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/H2SchemaQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/schema/H2SchemaQueries.java
similarity index 97%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/H2SchemaQueries.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/schema/H2SchemaQueries.java
index f78d2c4ab..041053afb 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/H2SchemaQueries.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/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 .
*/
-package com.djrapitops.plan.db.sql.queries;
+package com.djrapitops.plan.db.sql.queries.schema;
import com.djrapitops.plan.db.access.CountQueryStatement;
import com.djrapitops.plan.db.access.Query;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/MySQLSchemaQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/schema/MySQLSchemaQueries.java
similarity index 99%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/MySQLSchemaQueries.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/schema/MySQLSchemaQueries.java
index cdba5671f..da3fc01a5 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/MySQLSchemaQueries.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/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 .
*/
-package com.djrapitops.plan.db.sql.queries;
+package com.djrapitops.plan.db.sql.queries.schema;
import com.djrapitops.plan.db.access.CountQueryStatement;
import com.djrapitops.plan.db.access.Query;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/SQLiteSchemaQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/schema/SQLiteSchemaQueries.java
similarity index 97%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/SQLiteSchemaQueries.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/schema/SQLiteSchemaQueries.java
index 8ba9fc5a1..e627ce110 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/queries/SQLiteSchemaQueries.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/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 .
*/
-package com.djrapitops.plan.db.sql.queries;
+package com.djrapitops.plan.db.sql.queries.schema;
import com.djrapitops.plan.db.access.CountQueryStatement;
import com.djrapitops.plan.db.access.Query;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/CreateIndexTask.java b/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/CreateIndexTask.java
index 99975762a..0d0576f89 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/CreateIndexTask.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/tasks/CreateIndexTask.java
@@ -19,7 +19,7 @@ package com.djrapitops.plan.db.tasks;
import com.djrapitops.plan.db.DBType;
import com.djrapitops.plan.db.SQLDB;
import com.djrapitops.plan.db.sql.parsing.Column;
-import com.djrapitops.plan.db.sql.queries.MySQLSchemaQueries;
+import com.djrapitops.plan.db.sql.queries.schema.MySQLSchemaQueries;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plugin.task.AbsRunnable;
import org.apache.commons.text.TextStringBuilder;