diff --git a/app/src/main/java/org/thoughtcrime/securesms/dms/Callbacks.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/Callbacks.kt
similarity index 66%
rename from app/src/main/java/org/thoughtcrime/securesms/dms/Callbacks.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/Callbacks.kt
index cd0fa6a33f..f9fd901671 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dms/Callbacks.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/Callbacks.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.dms
+package org.thoughtcrime.securesms.conversation.newmessage
 
 interface Callbacks {
     fun onChange(value: String) {}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dms/EnterPublicKeyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/EnterPublicKeyFragment.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/dms/EnterPublicKeyFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/EnterPublicKeyFragment.kt
index 475385d097..c327d93e4a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dms/EnterPublicKeyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/EnterPublicKeyFragment.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.dms
+package org.thoughtcrime.securesms.conversation.new
 
 import android.content.ClipData
 import android.content.ClipboardManager
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessageFragment.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessageFragment.kt
index 1454e3dbd0..538996316c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessageFragment.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.dms
+package org.thoughtcrime.securesms.conversation.new
 
 import android.content.Intent
 import android.os.Bundle
@@ -38,6 +38,10 @@ import kotlinx.coroutines.launch
 import network.loki.messenger.R
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.conversation.newmessage.Callbacks
+import org.thoughtcrime.securesms.conversation.newmessage.Event
+import org.thoughtcrime.securesms.conversation.newmessage.NewMessageViewModel
+import org.thoughtcrime.securesms.conversation.newmessage.State
 import org.thoughtcrime.securesms.conversation.start.NewConversationDelegate
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessageViewModel.kt
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessageViewModel.kt
index 93b4e27556..dd6b4dddcb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/newmessage/NewMessageViewModel.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.dms
+package org.thoughtcrime.securesms.conversation.newmessage
 
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationFragment.kt
index 25292078c8..b75373022d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/NewConversationFragment.kt
@@ -15,8 +15,8 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
 import org.session.libsession.utilities.Address
+import org.thoughtcrime.securesms.conversation.new.NewMessageFragment
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
-import org.thoughtcrime.securesms.dms.NewMessageFragment
 import org.thoughtcrime.securesms.groups.CreateGroupFragment
 import org.thoughtcrime.securesms.groups.JoinCommunityFragment