diff --git a/sessionmessaging/src/main/java/org/session/messaging/messages/Message+Destination.kt b/sessionmessaging/src/main/java/org/session/messaging/messages/Destination.kt
similarity index 59%
rename from sessionmessaging/src/main/java/org/session/messaging/messages/Message+Destination.kt
rename to sessionmessaging/src/main/java/org/session/messaging/messages/Destination.kt
index 5847f726a1..bd39ccbbce 100644
--- a/sessionmessaging/src/main/java/org/session/messaging/messages/Message+Destination.kt
+++ b/sessionmessaging/src/main/java/org/session/messaging/messages/Destination.kt
@@ -1,2 +1,5 @@
 package org.session.messaging.messages
 
+enum class Destination {
+
+}
\ No newline at end of file
diff --git a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+Contatct.kt b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/Contact.kt
similarity index 64%
rename from sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+Contatct.kt
rename to sessionmessaging/src/main/java/org/session/messaging/messages/visible/Contact.kt
index 44951d4ad1..7efb865119 100644
--- a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+Contatct.kt
+++ b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/Contact.kt
@@ -1,2 +1,4 @@
 package org.session.messaging.messages.visible
 
+internal class Contact {
+}
\ No newline at end of file
diff --git a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+LinkPreview.kt b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/LinkPreview.kt
similarity index 60%
rename from sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+LinkPreview.kt
rename to sessionmessaging/src/main/java/org/session/messaging/messages/visible/LinkPreview.kt
index 2f8d393b0c..a385545b51 100644
--- a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+LinkPreview.kt
+++ b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/LinkPreview.kt
@@ -1 +1,4 @@
 package org.session.messaging.messages.visible
+
+internal class LinkPreview {
+}
\ No newline at end of file
diff --git a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+Profile.kt b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/Profile.kt
similarity index 64%
rename from sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+Profile.kt
rename to sessionmessaging/src/main/java/org/session/messaging/messages/visible/Profile.kt
index 44951d4ad1..22740911ea 100644
--- a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+Profile.kt
+++ b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/Profile.kt
@@ -1,2 +1,4 @@
 package org.session.messaging.messages.visible
 
+internal class Profile {
+}
\ No newline at end of file
diff --git a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+Quote.kt b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/Quote.kt
similarity index 66%
rename from sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+Quote.kt
rename to sessionmessaging/src/main/java/org/session/messaging/messages/visible/Quote.kt
index 44951d4ad1..90e2c287c5 100644
--- a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/VisibleMessage+Quote.kt
+++ b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/Quote.kt
@@ -1,2 +1,4 @@
 package org.session.messaging.messages.visible
 
+internal class Quote {
+}
\ No newline at end of file
diff --git a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/attachments/VisibleMessage+Attachment.kt b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/attachments/Attachment.kt
similarity index 67%
rename from sessionmessaging/src/main/java/org/session/messaging/messages/visible/attachments/VisibleMessage+Attachment.kt
rename to sessionmessaging/src/main/java/org/session/messaging/messages/visible/attachments/Attachment.kt
index deb32fabfe..fa94a1808e 100644
--- a/sessionmessaging/src/main/java/org/session/messaging/messages/visible/attachments/VisibleMessage+Attachment.kt
+++ b/sessionmessaging/src/main/java/org/session/messaging/messages/visible/attachments/Attachment.kt
@@ -1,2 +1,4 @@
 package org.session.messaging.messages.visible.attachments
 
+internal class Attachment {
+}
\ No newline at end of file
diff --git a/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/Notification+MessageSender.kt b/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageReceiverDecryption.kt
similarity index 57%
rename from sessionmessaging/src/main/java/org/session/messaging/sending_receiving/Notification+MessageSender.kt
rename to sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageReceiverDecryption.kt
index 72036e203d..6b0ee22072 100644
--- a/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/Notification+MessageSender.kt
+++ b/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageReceiverDecryption.kt
@@ -1,2 +1,4 @@
 package org.session.messaging.sending_receiving
 
+object MessageReceiverDecryption {
+}
\ No newline at end of file
diff --git a/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageSender+Encryption.kt b/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageSenderEncryption.kt
similarity index 59%
rename from sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageSender+Encryption.kt
rename to sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageSenderEncryption.kt
index 72036e203d..65e9828fbb 100644
--- a/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageSender+Encryption.kt
+++ b/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageSenderEncryption.kt
@@ -1,2 +1,4 @@
 package org.session.messaging.sending_receiving
 
+object MessageSenderEncryption {
+}
\ No newline at end of file
diff --git a/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageReceiver+Decryption.kt b/sessionmessaging/src/main/java/org/session/messaging/sending_receiving/Notification.kt
similarity index 100%
rename from sessionmessaging/src/main/java/org/session/messaging/sending_receiving/MessageReceiver+Decryption.kt
rename to sessionmessaging/src/main/java/org/session/messaging/sending_receiving/Notification.kt