diff --git a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java
index 872f3d09c..53b64dc31 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/RegisterCommand.java
@@ -19,7 +19,7 @@ package com.djrapitops.plan.command.commands;
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.db.Database;
 import com.djrapitops.plan.db.access.queries.objects.WebUserQueries;
-import com.djrapitops.plan.db.access.transactions.RegisterWebUserTransaction;
+import com.djrapitops.plan.db.access.transactions.commands.RegisterWebUserTransaction;
 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/command/commands/manage/ManageClearCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java
index 4c4f2adf4..f1896086b 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageClearCommand.java
@@ -20,7 +20,7 @@ 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.db.access.transactions.RemoveEverythingTransaction;
+import com.djrapitops.plan.db.access.transactions.commands.RemoveEverythingTransaction;
 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/command/commands/manage/ManageRemoveCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java
index a09262804..6401e49ee 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageRemoveCommand.java
@@ -19,7 +19,7 @@ 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.db.access.queries.PlayerFetchQueries;
-import com.djrapitops.plan.db.access.transactions.RemovePlayerTransaction;
+import com.djrapitops.plan.db.access.transactions.commands.RemovePlayerTransaction;
 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/command/commands/webuser/WebDeleteCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebDeleteCommand.java
index 1886da8eb..c402876de 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebDeleteCommand.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/webuser/WebDeleteCommand.java
@@ -19,7 +19,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.access.queries.objects.WebUserQueries;
-import com.djrapitops.plan.db.access.transactions.RemoveWebUserTransaction;
+import com.djrapitops.plan.db.access.transactions.commands.RemoveWebUserTransaction;
 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/access/transactions/BackupCopyTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/BackupCopyTransaction.java
index fe272cce1..ebb97eeed 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/BackupCopyTransaction.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/BackupCopyTransaction.java
@@ -22,6 +22,7 @@ import com.djrapitops.plan.db.access.Query;
 import com.djrapitops.plan.db.access.queries.LargeFetchQueries;
 import com.djrapitops.plan.db.access.queries.LargeStoreQueries;
 import com.djrapitops.plan.db.access.queries.objects.*;
+import com.djrapitops.plan.db.access.transactions.commands.RemoveEverythingTransaction;
 
 import java.util.function.Function;
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CleanTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CleanTransaction.java
index d0e16d41d..94b1879ae 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CleanTransaction.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/CleanTransaction.java
@@ -20,6 +20,7 @@ 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.access.queries.OptionalFetchQueries;
+import com.djrapitops.plan.db.access.transactions.commands.RemovePlayerTransaction;
 import com.djrapitops.plan.db.sql.tables.PingTable;
 import com.djrapitops.plan.db.sql.tables.TPSTable;
 import com.djrapitops.plan.system.locale.Locale;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RegisterWebUserTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RegisterWebUserTransaction.java
similarity index 93%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RegisterWebUserTransaction.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RegisterWebUserTransaction.java
index 26b56e768..dcf23199a 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RegisterWebUserTransaction.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RegisterWebUserTransaction.java
@@ -14,10 +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.db.access.transactions;
+package com.djrapitops.plan.db.access.transactions.commands;
 
 import com.djrapitops.plan.data.WebUser;
 import com.djrapitops.plan.db.access.ExecStatement;
+import com.djrapitops.plan.db.access.transactions.Transaction;
 import com.djrapitops.plan.db.sql.tables.SecurityTable;
 
 import java.sql.PreparedStatement;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemoveEverythingTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RemoveEverythingTransaction.java
similarity index 93%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemoveEverythingTransaction.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RemoveEverythingTransaction.java
index 9cf8057f6..c87f5962f 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemoveEverythingTransaction.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RemoveEverythingTransaction.java
@@ -14,8 +14,9 @@
  *  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.access.transactions;
+package com.djrapitops.plan.db.access.transactions.commands;
 
+import com.djrapitops.plan.db.access.transactions.Transaction;
 import com.djrapitops.plan.db.sql.tables.*;
 
 /**
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemovePlayerTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RemovePlayerTransaction.java
similarity index 95%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemovePlayerTransaction.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RemovePlayerTransaction.java
index bb253ce26..0ea22cfce 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemovePlayerTransaction.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RemovePlayerTransaction.java
@@ -14,10 +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.db.access.transactions;
+package com.djrapitops.plan.db.access.transactions.commands;
 
 import com.djrapitops.plan.db.access.ExecStatement;
 import com.djrapitops.plan.db.access.queries.PlayerFetchQueries;
+import com.djrapitops.plan.db.access.transactions.Transaction;
 import com.djrapitops.plan.db.sql.tables.*;
 
 import java.sql.PreparedStatement;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemoveWebUserTransaction.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RemoveWebUserTransaction.java
similarity index 92%
rename from Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemoveWebUserTransaction.java
rename to Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RemoveWebUserTransaction.java
index ce064e9e2..bbf3752a5 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/RemoveWebUserTransaction.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/transactions/commands/RemoveWebUserTransaction.java
@@ -14,9 +14,10 @@
  *  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.access.transactions;
+package com.djrapitops.plan.db.access.transactions.commands;
 
 import com.djrapitops.plan.db.access.ExecStatement;
+import com.djrapitops.plan.db.access.transactions.Transaction;
 import com.djrapitops.plan.db.sql.tables.SecurityTable;
 
 import java.sql.PreparedStatement;
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 73b7932f2..f45ae84cc 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
@@ -22,9 +22,7 @@ import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
 import com.djrapitops.plan.db.sql.parsing.Sql;
 
 /**
- * Table that is in charge of storing common IP and Geolocation data for users.
- * <p>
- * Table Name: plan_ips
+ * Table information about 'plan_ips'.
  * <p>
  * Patches related to this table:
  * {@link Version10Patch}
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/PingTable.java b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/PingTable.java
index 467249de5..fbd37adaf 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/PingTable.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/sql/tables/PingTable.java
@@ -22,7 +22,7 @@ import com.djrapitops.plan.db.sql.parsing.CreateTableParser;
 import com.djrapitops.plan.db.sql.parsing.Sql;
 
 /**
- * Table that represents plan_ping in the database.
+ * Table information about 'plan_ping'.
  * <p>
  * Patches related to this table:
  * {@link PingOptimizationPatch}
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 e5f067fca..33a210b4a 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
@@ -35,6 +35,10 @@ import com.djrapitops.plan.db.access.queries.*;
 import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.db.access.queries.objects.*;
 import com.djrapitops.plan.db.access.transactions.*;
+import com.djrapitops.plan.db.access.transactions.commands.RegisterWebUserTransaction;
+import com.djrapitops.plan.db.access.transactions.commands.RemoveEverythingTransaction;
+import com.djrapitops.plan.db.access.transactions.commands.RemovePlayerTransaction;
+import com.djrapitops.plan.db.access.transactions.commands.RemoveWebUserTransaction;
 import com.djrapitops.plan.db.access.transactions.events.*;
 import com.djrapitops.plan.db.patches.Patch;
 import com.djrapitops.plan.db.sql.tables.ServerTable;
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java
index cb81490d3..c975d39d0 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java
+++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java
@@ -21,8 +21,8 @@ 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.access.transactions.commands.RemoveEverythingTransaction;
 import com.djrapitops.plan.db.patches.Patch;
 import com.djrapitops.plan.system.settings.config.PlanConfig;
 import com.djrapitops.plan.system.settings.paths.DatabaseSettings;
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java
index 40e52ba61..52f46c985 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java
+++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java
@@ -22,8 +22,8 @@ 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.access.transactions.commands.RemoveEverythingTransaction;
 import com.djrapitops.plan.db.patches.Patch;
 import com.djrapitops.plan.system.PlanSystem;
 import com.djrapitops.plan.system.settings.config.PlanConfig;
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java
index 177db78eb..727108e45 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java
+++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java
@@ -21,8 +21,8 @@ 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.access.transactions.commands.RemoveEverythingTransaction;
 import com.djrapitops.plan.db.patches.Patch;
 import org.junit.After;
 import org.junit.Before;
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/system/webserver/HTTPSWebServerAuthTest.java b/Plan/common/src/test/java/com/djrapitops/plan/system/webserver/HTTPSWebServerAuthTest.java
index 2821cdbf7..2f57a7dce 100644
--- a/Plan/common/src/test/java/com/djrapitops/plan/system/webserver/HTTPSWebServerAuthTest.java
+++ b/Plan/common/src/test/java/com/djrapitops/plan/system/webserver/HTTPSWebServerAuthTest.java
@@ -18,7 +18,7 @@ package com.djrapitops.plan.system.webserver;
 
 import com.djrapitops.plan.api.exceptions.connection.*;
 import com.djrapitops.plan.data.WebUser;
-import com.djrapitops.plan.db.access.transactions.RegisterWebUserTransaction;
+import com.djrapitops.plan.db.access.transactions.commands.RegisterWebUserTransaction;
 import com.djrapitops.plan.system.PlanSystem;
 import com.djrapitops.plan.system.settings.config.PlanConfig;
 import com.djrapitops.plan.system.settings.paths.WebserverSettings;