diff --git a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt b/src/main/kotlin/net/moonleay/lilJudd/Bot.kt
index 750eb8c..1201560 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/Bot.kt
@@ -33,7 +33,7 @@ import kotlinx.coroutines.launch
 import net.moonleay.botendo.build.BuildConstants
 import net.moonleay.lilJudd.buttons.component.EditButtonManager
 import net.moonleay.lilJudd.data.CredentialManager
-import net.moonleay.lilJudd.data.DB
+import net.moonleay.lilJudd.data.database.DB
 import net.moonleay.lilJudd.extensions.*
 import net.moonleay.lilJudd.features.AvailabilityManager
 import net.moonleay.lilJudd.features.MatchManager
diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt
index 115a7e5..4e04fa1 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/AcceptEditButton.kt
@@ -28,7 +28,7 @@ import dev.kord.core.entity.interaction.ButtonInteraction
 import dev.kord.rest.builder.message.modify.embed
 import net.moonleay.lilJudd.Bot
 import net.moonleay.lilJudd.buttons.component.IEditButton
-import net.moonleay.lilJudd.data.repository.MatchPlanningDataRepository
+import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository
 import net.moonleay.lilJudd.util.EmbedUtil
 import net.moonleay.lilJudd.util.Logger
 import net.moonleay.lilJudd.util.MessageUtil
diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt
index c7cebc3..348446c 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/CancelEditButton.kt
@@ -28,7 +28,7 @@ import dev.kord.core.entity.interaction.ButtonInteraction
 import dev.kord.rest.builder.message.modify.embed
 import net.moonleay.lilJudd.Bot
 import net.moonleay.lilJudd.buttons.component.IEditButton
-import net.moonleay.lilJudd.data.repository.MatchPlanningDataRepository
+import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository
 import net.moonleay.lilJudd.util.EmbedUtil
 import net.moonleay.lilJudd.util.Logger
 
diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt
index d775a29..93f6b36 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/matchplanner/DeclineEditButton.kt
@@ -28,7 +28,7 @@ import dev.kord.core.entity.interaction.ButtonInteraction
 import dev.kord.rest.builder.message.modify.embed
 import net.moonleay.lilJudd.Bot
 import net.moonleay.lilJudd.buttons.component.IEditButton
-import net.moonleay.lilJudd.data.repository.MatchPlanningDataRepository
+import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository
 import net.moonleay.lilJudd.util.EmbedUtil
 import net.moonleay.lilJudd.util.Logger
 import net.moonleay.lilJudd.util.MessageUtil
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/DB.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/DB.kt
similarity index 83%
rename from src/main/kotlin/net/moonleay/lilJudd/data/DB.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/DB.kt
index f02009e..7c58ea0 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/DB.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/DB.kt
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data
+package net.moonleay.lilJudd.data.database
 
 
-import net.moonleay.lilJudd.data.tables.MatchPlanningData
-import net.moonleay.lilJudd.data.tables.PlanningNotifierRoles
-import net.moonleay.lilJudd.data.tables.TimePlanningChannels
-import net.moonleay.lilJudd.data.tables.TimePlanningMessages
+import net.moonleay.lilJudd.data.database.tables.MatchPlanningData
+import net.moonleay.lilJudd.data.database.tables.PlanningNotifierRoles
+import net.moonleay.lilJudd.data.database.tables.TimePlanningChannels
+import net.moonleay.lilJudd.data.database.tables.TimePlanningMessages
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.SchemaUtils
 import org.jetbrains.exposed.sql.transactions.transaction
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/entry/MatchPlanningDataData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/MatchPlanningDataData.kt
similarity index 95%
rename from src/main/kotlin/net/moonleay/lilJudd/data/entry/MatchPlanningDataData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/entry/MatchPlanningDataData.kt
index f48dc28..b19c5e7 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/entry/MatchPlanningDataData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/MatchPlanningDataData.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.entry
+package net.moonleay.lilJudd.data.database.entry
 
 data class MatchPlanningDataData(
     val id: Int,
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/entry/PlanningNotifierRolesData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/PlanningNotifierRolesData.kt
similarity index 95%
rename from src/main/kotlin/net/moonleay/lilJudd/data/entry/PlanningNotifierRolesData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/entry/PlanningNotifierRolesData.kt
index 730e7fe..c58130a 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/entry/PlanningNotifierRolesData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/PlanningNotifierRolesData.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.entry
+package net.moonleay.lilJudd.data.database.entry
 
 data class PlanningNotifierRolesData(
     val id: Int, // The id of the entry
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningChannelsData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningChannelsData.kt
similarity index 94%
rename from src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningChannelsData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningChannelsData.kt
index fba9898..7edd496 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningChannelsData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningChannelsData.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.entry
+package net.moonleay.lilJudd.data.database.entry
 
 data class TimePlanningChannelsData(
     val id: Int,
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningMessagesData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningMessagesData.kt
similarity index 95%
rename from src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningMessagesData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningMessagesData.kt
index fcb283b..3126e2c 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/entry/TimePlanningMessagesData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/entry/TimePlanningMessagesData.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.entry
+package net.moonleay.lilJudd.data.database.entry
 
 data class TimePlanningMessagesData(
     val id: Int, // The id of the entry
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/repository/MatchPlanningDataRepository.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/MatchPlanningDataRepository.kt
similarity index 95%
rename from src/main/kotlin/net/moonleay/lilJudd/data/repository/MatchPlanningDataRepository.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/repository/MatchPlanningDataRepository.kt
index 385eb69..84a1e66 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/repository/MatchPlanningDataRepository.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/MatchPlanningDataRepository.kt
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.repository
+package net.moonleay.lilJudd.data.database.repository
 
-import net.moonleay.lilJudd.data.entry.MatchPlanningDataData
-import net.moonleay.lilJudd.data.tables.MatchPlanningData
+import net.moonleay.lilJudd.data.database.entry.MatchPlanningDataData
+import net.moonleay.lilJudd.data.database.tables.MatchPlanningData
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.transactions.transaction
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/repository/PlanningNotifierRolesRepository.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/PlanningNotifierRolesRepository.kt
similarity index 95%
rename from src/main/kotlin/net/moonleay/lilJudd/data/repository/PlanningNotifierRolesRepository.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/repository/PlanningNotifierRolesRepository.kt
index 2603081..4059e70 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/repository/PlanningNotifierRolesRepository.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/PlanningNotifierRolesRepository.kt
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.repository
+package net.moonleay.lilJudd.data.database.repository
 
-import net.moonleay.lilJudd.data.entry.PlanningNotifierRolesData
-import net.moonleay.lilJudd.data.tables.PlanningNotifierRoles
+import net.moonleay.lilJudd.data.database.entry.PlanningNotifierRolesData
+import net.moonleay.lilJudd.data.database.tables.PlanningNotifierRoles
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.transactions.transaction
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/repository/TimePlanningChannelsRepository.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningChannelsRepository.kt
similarity index 92%
rename from src/main/kotlin/net/moonleay/lilJudd/data/repository/TimePlanningChannelsRepository.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningChannelsRepository.kt
index 7756802..f5fd171 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/repository/TimePlanningChannelsRepository.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningChannelsRepository.kt
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.repository
+package net.moonleay.lilJudd.data.database.repository
 
-import net.moonleay.lilJudd.data.entry.TimePlanningChannelsData
-import net.moonleay.lilJudd.data.tables.TimePlanningChannels
+import net.moonleay.lilJudd.data.database.entry.TimePlanningChannelsData
+import net.moonleay.lilJudd.data.database.tables.TimePlanningChannels
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.transactions.transaction
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/repository/TimePlanningMessagesRepository.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningMessagesRepository.kt
similarity index 93%
rename from src/main/kotlin/net/moonleay/lilJudd/data/repository/TimePlanningMessagesRepository.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningMessagesRepository.kt
index 5e2f273..780a939 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/repository/TimePlanningMessagesRepository.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/repository/TimePlanningMessagesRepository.kt
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.repository
+package net.moonleay.lilJudd.data.database.repository
 
-import net.moonleay.lilJudd.data.entry.TimePlanningMessagesData
-import net.moonleay.lilJudd.data.tables.TimePlanningMessages
+import net.moonleay.lilJudd.data.database.entry.TimePlanningMessagesData
+import net.moonleay.lilJudd.data.database.tables.TimePlanningMessages
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.select
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/tables/MatchPlanningData.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/MatchPlanningData.kt
similarity index 96%
rename from src/main/kotlin/net/moonleay/lilJudd/data/tables/MatchPlanningData.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/tables/MatchPlanningData.kt
index e2e8afa..391b3e8 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/tables/MatchPlanningData.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/MatchPlanningData.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.tables
+package net.moonleay.lilJudd.data.database.tables
 
 import org.jetbrains.exposed.sql.Table
 
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/tables/PlanningNotifierRoles.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/PlanningNotifierRoles.kt
similarity index 95%
rename from src/main/kotlin/net/moonleay/lilJudd/data/tables/PlanningNotifierRoles.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/tables/PlanningNotifierRoles.kt
index e2fc9e0..66fe906 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/tables/PlanningNotifierRoles.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/PlanningNotifierRoles.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.tables
+package net.moonleay.lilJudd.data.database.tables
 
 import org.jetbrains.exposed.sql.Table
 
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningChannels.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningChannels.kt
similarity index 94%
rename from src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningChannels.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningChannels.kt
index a521838..d3b31e3 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningChannels.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningChannels.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.tables
+package net.moonleay.lilJudd.data.database.tables
 
 import org.jetbrains.exposed.sql.Table
 
diff --git a/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningMessages.kt b/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningMessages.kt
similarity index 95%
rename from src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningMessages.kt
rename to src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningMessages.kt
index 8f8a01b..dd48838 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/data/tables/TimePlanningMessages.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/data/database/tables/TimePlanningMessages.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package net.moonleay.lilJudd.data.tables
+package net.moonleay.lilJudd.data.database.tables
 
 import org.jetbrains.exposed.sql.Table
 
diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt b/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt
index 17592e6..9f2674d 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/extensions/MatchExtension.kt
@@ -28,8 +28,8 @@ import com.kotlindiscord.kord.extensions.types.respond
 import dev.kord.core.behavior.channel.createMessage
 import dev.kord.core.behavior.createRole
 import dev.kord.rest.builder.message.create.actionRow
-import net.moonleay.lilJudd.data.entry.MatchPlanningDataData
-import net.moonleay.lilJudd.data.repository.MatchPlanningDataRepository
+import net.moonleay.lilJudd.data.database.entry.MatchPlanningDataData
+import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository
 import net.moonleay.lilJudd.extensions.component.MatchTypes
 import net.moonleay.lilJudd.jobs.MatchJob
 import net.moonleay.lilJudd.jobs.component.JobManager
diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt b/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt
index ee85372..7b85b1d 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt
@@ -26,8 +26,8 @@ import dev.kord.common.entity.Permission
 import dev.kord.core.behavior.channel.createMessage
 import dev.kord.rest.builder.message.create.actionRow
 import kotlinx.coroutines.delay
-import net.moonleay.lilJudd.data.entry.TimePlanningMessagesData
-import net.moonleay.lilJudd.data.repository.TimePlanningMessagesRepository
+import net.moonleay.lilJudd.data.database.entry.TimePlanningMessagesData
+import net.moonleay.lilJudd.data.database.repository.TimePlanningMessagesRepository
 import net.moonleay.lilJudd.util.*
 import java.time.ZoneId
 import java.time.ZonedDateTime
diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt b/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt
index df88ee1..148c251 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt
@@ -30,10 +30,10 @@ import dev.kord.core.entity.channel.MessageChannel
 import dev.kord.gateway.PrivilegedIntent
 import dev.kord.rest.builder.message.EmbedBuilder
 import net.moonleay.lilJudd.Bot
-import net.moonleay.lilJudd.data.entry.PlanningNotifierRolesData
-import net.moonleay.lilJudd.data.entry.TimePlanningMessagesData
-import net.moonleay.lilJudd.data.repository.PlanningNotifierRolesRepository
-import net.moonleay.lilJudd.data.repository.TimePlanningMessagesRepository
+import net.moonleay.lilJudd.data.database.entry.PlanningNotifierRolesData
+import net.moonleay.lilJudd.data.database.entry.TimePlanningMessagesData
+import net.moonleay.lilJudd.data.database.repository.PlanningNotifierRolesRepository
+import net.moonleay.lilJudd.data.database.repository.TimePlanningMessagesRepository
 import net.moonleay.lilJudd.extensions.FeatureManageExtension
 import net.moonleay.lilJudd.features.component.FeatureEnum
 import net.moonleay.lilJudd.features.component.IFeature
diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt b/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt
index fc89dc9..129fdc0 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/features/MatchManager.kt
@@ -20,8 +20,8 @@ package net.moonleay.lilJudd.features
 
 import dev.kord.common.entity.Snowflake
 import net.moonleay.lilJudd.Bot
-import net.moonleay.lilJudd.data.entry.MatchPlanningDataData
-import net.moonleay.lilJudd.data.repository.MatchPlanningDataRepository
+import net.moonleay.lilJudd.data.database.entry.MatchPlanningDataData
+import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository
 import net.moonleay.lilJudd.jobs.MatchJob
 import net.moonleay.lilJudd.jobs.component.JobManager
 import net.moonleay.lilJudd.util.Logger
diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt b/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt
index d986440..ec073ac 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt
@@ -29,11 +29,11 @@ import dev.kord.rest.builder.message.EmbedBuilder
 import dev.kord.rest.builder.message.create.actionRow
 import kotlinx.coroutines.delay
 import net.moonleay.lilJudd.Bot
-import net.moonleay.lilJudd.data.entry.TimePlanningChannelsData
-import net.moonleay.lilJudd.data.entry.TimePlanningMessagesData
-import net.moonleay.lilJudd.data.repository.PlanningNotifierRolesRepository
-import net.moonleay.lilJudd.data.repository.TimePlanningChannelsRepository
-import net.moonleay.lilJudd.data.repository.TimePlanningMessagesRepository
+import net.moonleay.lilJudd.data.database.entry.TimePlanningChannelsData
+import net.moonleay.lilJudd.data.database.entry.TimePlanningMessagesData
+import net.moonleay.lilJudd.data.database.repository.PlanningNotifierRolesRepository
+import net.moonleay.lilJudd.data.database.repository.TimePlanningChannelsRepository
+import net.moonleay.lilJudd.data.database.repository.TimePlanningMessagesRepository
 import net.moonleay.lilJudd.extensions.FeatureManageExtension
 import net.moonleay.lilJudd.features.component.FeatureEnum
 import net.moonleay.lilJudd.features.component.IFeature
diff --git a/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt b/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt
index 8360f62..6f13dfa 100644
--- a/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt
+++ b/src/main/kotlin/net/moonleay/lilJudd/jobs/MatchJob.kt
@@ -22,7 +22,7 @@ import dev.inmo.krontab.KronScheduler
 import dev.kord.common.entity.Snowflake
 import kotlinx.coroutines.Job
 import net.moonleay.lilJudd.Bot
-import net.moonleay.lilJudd.data.repository.MatchPlanningDataRepository
+import net.moonleay.lilJudd.data.database.repository.MatchPlanningDataRepository
 import net.moonleay.lilJudd.jobs.component.CronjobType
 import net.moonleay.lilJudd.jobs.component.ICronjob
 import net.moonleay.lilJudd.jobs.component.JobManager