diff --git a/src/common/Edelstein.Common.Gameplay.Game/Dialogs/Conversations/ConversationDialog.cs b/src/common/Edelstein.Common.Gameplay.Game/Dialogs/Conversations/ConversationDialog.cs
index b7a5ee024..39808c406 100644
--- a/src/common/Edelstein.Common.Gameplay.Game/Dialogs/Conversations/ConversationDialog.cs
+++ b/src/common/Edelstein.Common.Gameplay.Game/Dialogs/Conversations/ConversationDialog.cs
@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
-using Edelstein.Protocol.Gameplay.Game.Conversations;
-using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
+using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
+using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;
 using Edelstein.Protocol.Gameplay.Game.Objects.Users;
 
-namespace Edelstein.Common.Gameplay.Game.Conversations;
+namespace Edelstein.Common.Gameplay.Game.Dialogs.Conversations;
 
 public class ConversationDialog<TSelf, TTarget>(
     IFieldUser user,
diff --git a/src/common/Edelstein.Common.Gameplay.Game/Objects/Users/FieldUser.cs b/src/common/Edelstein.Common.Gameplay.Game/Objects/Users/FieldUser.cs
index cc8882d0c..09c81362b 100644
--- a/src/common/Edelstein.Common.Gameplay.Game/Objects/Users/FieldUser.cs
+++ b/src/common/Edelstein.Common.Gameplay.Game/Objects/Users/FieldUser.cs
@@ -2,15 +2,15 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Edelstein.Common.Gameplay.Game.Conversations;
-using Edelstein.Common.Gameplay.Game.Conversations.Speakers;
+using Edelstein.Common.Gameplay.Game.Dialogs.Conversations;
+using Edelstein.Common.Gameplay.Game.Dialogs.Conversations.Speakers;
 using Edelstein.Common.Gameplay.Game.Objects.Users.Stats;
 using Edelstein.Protocol.Gameplay.Entities;
 using Edelstein.Protocol.Gameplay.Game;
 using Edelstein.Protocol.Gameplay.Game.Contracts.Packets.Send;
-using Edelstein.Protocol.Gameplay.Game.Conversations;
-using Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
 using Edelstein.Protocol.Gameplay.Game.Dialogs;
+using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
+using Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;
 using Edelstein.Protocol.Gameplay.Game.Objects;
 using Edelstein.Protocol.Gameplay.Game.Objects.Users;
 using Edelstein.Protocol.Gameplay.Game.Objects.Users.Stats;
diff --git a/src/protocol/Edelstein.Protocol.Gameplay.Game/Dialogs/Conversations/IConversationDialog.cs b/src/protocol/Edelstein.Protocol.Gameplay.Game/Dialogs/Conversations/IConversationDialog.cs
index b5eaccdff..a23078596 100644
--- a/src/protocol/Edelstein.Protocol.Gameplay.Game/Dialogs/Conversations/IConversationDialog.cs
+++ b/src/protocol/Edelstein.Protocol.Gameplay.Game/Dialogs/Conversations/IConversationDialog.cs
@@ -1,6 +1,4 @@
-using Edelstein.Protocol.Gameplay.Game.Dialogs;
-
-namespace Edelstein.Protocol.Gameplay.Game.Conversations;
+namespace Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations;
 
 public interface IConversationDialog : IDialog
 {
diff --git a/src/protocol/Edelstein.Protocol.Gameplay.Game/Dialogs/Conversations/Speakers/ConversationSpeakerParam.cs b/src/protocol/Edelstein.Protocol.Gameplay.Game/Dialogs/Conversations/Speakers/ConversationSpeakerParam.cs
index 790eba31b..b8f82ff6a 100644
--- a/src/protocol/Edelstein.Protocol.Gameplay.Game/Dialogs/Conversations/Speakers/ConversationSpeakerParam.cs
+++ b/src/protocol/Edelstein.Protocol.Gameplay.Game/Dialogs/Conversations/Speakers/ConversationSpeakerParam.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Edelstein.Protocol.Gameplay.Game.Conversations.Speakers;
+namespace Edelstein.Protocol.Gameplay.Game.Dialogs.Conversations.Speakers;
 
 [Flags]
 public enum ConversationSpeakerParam : byte