diff --git a/core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfig.java b/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java
similarity index 96%
rename from core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfig.java
rename to core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java
index 708eec2a..b0f5b177 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfig.java
+++ b/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfig.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.core.database.config;
+package org.geysermc.floodgate.database.config;
 
 /**
  * Base class for every database related configuration.
diff --git a/core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfigLoader.java b/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java
similarity index 98%
rename from core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfigLoader.java
rename to core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java
index c575c3fc..a0683a08 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/database/config/DatabaseConfigLoader.java
+++ b/core/src/main/java/org/geysermc/floodgate/database/config/DatabaseConfigLoader.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.core.database.config;
+package org.geysermc.floodgate.database.config;
 
 import com.google.gson.JsonObject;
 import com.google.inject.Inject;
diff --git a/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java b/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
index 507b2fc7..ecf60942 100644
--- a/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
+++ b/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
@@ -41,8 +41,8 @@
 import org.geysermc.floodgate.api.link.PlayerLink;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.core.config.FloodgateConfig;
-import org.geysermc.floodgate.core.database.config.DatabaseConfig;
-import org.geysermc.floodgate.core.database.config.DatabaseConfigLoader;
+import org.geysermc.floodgate.database.config.DatabaseConfig;
+import org.geysermc.floodgate.database.config.DatabaseConfigLoader;
 import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent;
 import org.geysermc.floodgate.core.util.InjectorHolder;
 
diff --git a/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java b/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java
index cec6a324..e7cfae8e 100644
--- a/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java
+++ b/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java
@@ -26,7 +26,6 @@
 package org.geysermc.floodgate.database.config;
 
 import lombok.Getter;
-import org.geysermc.floodgate.core.database.config.DatabaseConfig;
 
 @Getter
 public class MongoConfig implements DatabaseConfig {
diff --git a/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java b/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java
index 0af667ac..b85748e7 100644
--- a/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java
+++ b/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java
@@ -26,7 +26,6 @@
 package org.geysermc.floodgate.database.config;
 
 import lombok.Getter;
-import org.geysermc.floodgate.core.database.config.DatabaseConfig;
 
 @Getter
 public class MysqlConfig implements DatabaseConfig {