diff --git a/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt b/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt
index 9917e86..4bbca82 100644
--- a/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt
+++ b/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt
@@ -31,7 +31,7 @@ import app.dapk.st.matrix.crypto.cryptoService
 import app.dapk.st.matrix.crypto.installCryptoService
 import app.dapk.st.matrix.device.deviceService
 import app.dapk.st.matrix.device.installEncryptionService
-import app.dapk.st.matrix.device.internal.ApiMessage
+import app.dapk.st.matrix.message.internal.ApiMessage
 import app.dapk.st.matrix.http.MatrixHttpClient
 import app.dapk.st.matrix.http.ktor.KtorMatrixHttpClientFactory
 import app.dapk.st.matrix.message.MessageEncrypter
diff --git a/matrix/services/device/src/main/kotlin/app/dapk/st/matrix/device/internal/DefaultDeviceService.kt b/matrix/services/device/src/main/kotlin/app/dapk/st/matrix/device/internal/DefaultDeviceService.kt
index 1bfbe86..ad9fbdf 100644
--- a/matrix/services/device/src/main/kotlin/app/dapk/st/matrix/device/internal/DefaultDeviceService.kt
+++ b/matrix/services/device/src/main/kotlin/app/dapk/st/matrix/device/internal/DefaultDeviceService.kt
@@ -6,8 +6,6 @@ import app.dapk.st.matrix.device.DeviceService.OneTimeKeys.Key.SignedCurve.Ed255
 import app.dapk.st.matrix.device.KnownDeviceStore
 import app.dapk.st.matrix.device.ToDevicePayload
 import app.dapk.st.matrix.http.MatrixHttpClient
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import java.util.*
@@ -141,22 +139,3 @@ internal class DefaultDeviceService(
     }
 }
 
-@Serializable
-sealed class ApiMessage {
-
-    @Serializable
-    @SerialName("text_message")
-    data class TextMessage(
-        @SerialName("content") val content: TextContent,
-        @SerialName("room_id") val roomId: RoomId,
-        @SerialName("type") val type: String,
-    ) : ApiMessage() {
-
-        @Serializable
-        data class TextContent(
-            @SerialName("body") val body: String,
-            @SerialName("msgtype") val type: String = MessageType.TEXT.value,
-        )
-    }
-
-}
diff --git a/matrix/services/message/src/main/kotlin/app/dapk/st/matrix/message/internal/ApiMessage.kt b/matrix/services/message/src/main/kotlin/app/dapk/st/matrix/message/internal/ApiMessage.kt
new file mode 100644
index 0000000..7d4cbc7
--- /dev/null
+++ b/matrix/services/message/src/main/kotlin/app/dapk/st/matrix/message/internal/ApiMessage.kt
@@ -0,0 +1,26 @@
+package app.dapk.st.matrix.message.internal
+
+import app.dapk.st.matrix.common.MessageType
+import app.dapk.st.matrix.common.RoomId
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed class ApiMessage {
+
+    @Serializable
+    @SerialName("text_message")
+    data class TextMessage(
+        @SerialName("content") val content: TextContent,
+        @SerialName("room_id") val roomId: RoomId,
+        @SerialName("type") val type: String,
+    ) : ApiMessage() {
+
+        @Serializable
+        data class TextContent(
+            @SerialName("body") val body: String,
+            @SerialName("msgtype") val type: String = MessageType.TEXT.value,
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/test-harness/src/test/kotlin/test/TestMatrix.kt b/test-harness/src/test/kotlin/test/TestMatrix.kt
index 411f8b6..55206ac 100644
--- a/test-harness/src/test/kotlin/test/TestMatrix.kt
+++ b/test-harness/src/test/kotlin/test/TestMatrix.kt
@@ -16,7 +16,7 @@ import app.dapk.st.matrix.crypto.cryptoService
 import app.dapk.st.matrix.crypto.installCryptoService
 import app.dapk.st.matrix.device.deviceService
 import app.dapk.st.matrix.device.installEncryptionService
-import app.dapk.st.matrix.device.internal.ApiMessage
+import app.dapk.st.matrix.message.internal.ApiMessage
 import app.dapk.st.matrix.http.MatrixHttpClient
 import app.dapk.st.matrix.http.ktor.KtorMatrixHttpClientFactory
 import app.dapk.st.matrix.message.MessageEncrypter