diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/gui/chat/ChatC.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/gui/chat/ChatC.kt
index d62bfe4e2..d9247d8d4 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/gui/chat/ChatC.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/gui/chat/ChatC.kt
@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2022 Moritz Zwerger
+ * Copyright (C) 2020-2023 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -18,7 +18,7 @@ import de.bixilon.minosoft.config.profile.delegate.primitive.IntDelegate
 import de.bixilon.minosoft.config.profile.delegate.types.EnumDelegate
 import de.bixilon.minosoft.config.profile.profiles.gui.GUIProfile
 import de.bixilon.minosoft.config.profile.profiles.gui.chat.internal.InternalC
-import de.bixilon.minosoft.protocol.packets.c2s.play.SettingsC2SP
+import de.bixilon.minosoft.protocol.packets.c2s.common.SettingsC2SP
 
 class ChatC(profile: GUIProfile) {
     val internal = InternalC(profile)
diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/settings/ClientSettingsManager.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/settings/ClientSettingsManager.kt
index 3a2078d05..06ce23591 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/settings/ClientSettingsManager.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/settings/ClientSettingsManager.kt
@@ -17,7 +17,7 @@ import de.bixilon.kutil.observer.DataObserver.Companion.observe
 import de.bixilon.kutil.observer.set.SetObserver.Companion.observeSet
 import de.bixilon.minosoft.data.language.LanguageUtil
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
-import de.bixilon.minosoft.protocol.packets.c2s.play.SettingsC2SP
+import de.bixilon.minosoft.protocol.packets.c2s.common.SettingsC2SP
 import de.bixilon.minosoft.protocol.protocol.ProtocolStates
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_20_2_PRE1
 
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SettingsC2SP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/common/SettingsC2SP.kt
similarity index 98%
rename from src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SettingsC2SP.kt
rename to src/main/java/de/bixilon/minosoft/protocol/packets/c2s/common/SettingsC2SP.kt
index b2d6bd33f..59ec2dee2 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/play/SettingsC2SP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/c2s/common/SettingsC2SP.kt
@@ -10,7 +10,7 @@
  *
  * This software is not affiliated with Mojang AB, the original developer of Minecraft.
  */
-package de.bixilon.minosoft.protocol.packets.c2s.play
+package de.bixilon.minosoft.protocol.packets.c2s.common
 
 import de.bixilon.kutil.enums.EnumUtil
 import de.bixilon.kutil.enums.ValuesEnum
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt
index e3652608b..883fd3656 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt
@@ -16,13 +16,17 @@ package de.bixilon.minosoft.protocol.packets.registry
 import de.bixilon.minosoft.protocol.packets.c2s.common.HeartbeatC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.common.PongC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.common.ResourcepackC2SP
+import de.bixilon.minosoft.protocol.packets.c2s.common.SettingsC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.configuration.ReadyC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.handshake.HandshakeC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.login.ChannelC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.login.ConfigureC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.login.EncryptionC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.login.StartC2SP
-import de.bixilon.minosoft.protocol.packets.c2s.play.*
+import de.bixilon.minosoft.protocol.packets.c2s.play.NextChunkBatchC2SP
+import de.bixilon.minosoft.protocol.packets.c2s.play.ReconfigureC2SP
+import de.bixilon.minosoft.protocol.packets.c2s.play.SessionDataC2SP
+import de.bixilon.minosoft.protocol.packets.c2s.play.TradeC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.play.advancement.tab.AdvancementCloseTabC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.play.advancement.tab.AdvancementOpenTabC2SP
 import de.bixilon.minosoft.protocol.packets.c2s.play.block.*
@@ -123,6 +127,7 @@ object DefaultPackets {
             register("status_request", StatusRequestC2SP::class)
         },
         ProtocolStates.LOGIN to PacketRegistry(threadSafe = false, extra = PacketExtraHandler.Disconnect).apply {
+            register("channel", ChannelC2SP::class)
             register("channel", ChannelC2SP::class)
             register("encryption", EncryptionC2SP::class)
             register("enter_configuration", ConfigureC2SP::class)
@@ -134,6 +139,7 @@ object DefaultPackets {
             register("heartbeat", HeartbeatC2SP::class)
             register("pong", PongC2SP::class)
             register("resourcepack", ResourcepackC2SP::class)
+            register("settings", SettingsC2SP::class)
 
             register("ready", ReadyC2SP::class)
         },
@@ -142,6 +148,7 @@ object DefaultPackets {
             register("heartbeat", HeartbeatC2SP::class)
             register("pong", PongC2SP::class)
             register("resourcepack", ResourcepackC2SP::class)
+            register("settings", SettingsC2SP::class)
 
             register("advancement_tab", AdvancementCloseTabC2SP::class)
             register("advancement_tab", AdvancementOpenTabC2SP::class)
@@ -213,7 +220,6 @@ object DefaultPackets {
             register("ping", de.bixilon.minosoft.protocol.packets.c2s.play.PingC2SP::class)
             register("reconfigure", ReconfigureC2SP::class)
             register("session_data", SessionDataC2SP::class)
-            register("settings", SettingsC2SP::class)
             register("trade", TradeC2SP::class)
         },
     )