diff --git a/Sources/ElixxirDAppsSDK/AuthCallbacks.swift b/Sources/ElixxirDAppsSDK/AuthCallbacks.swift
index 51b1748b365828be2c5338663ba76273baf33006..8306b1f048d370af2daabe012627f91d864104b3 100644
--- a/Sources/ElixxirDAppsSDK/AuthCallbacks.swift
+++ b/Sources/ElixxirDAppsSDK/AuthCallbacks.swift
@@ -1,12 +1,6 @@
 import Bindings
 import XCTestDynamicOverlay
 
-public enum AuthCallback {
-  case confirm(contact: Data, receptionId: Data, ephemeralId: Int64, roundId: Int64)
-  case request(contact: Data, receptionId: Data, ephemeralId: Int64, roundId: Int64)
-  case reset(contact: Data, receptionId: Data, ephemeralId: Int64, roundId: Int64)
-}
-
 public struct AuthCallbacks {
   public init(handle: @escaping (AuthCallback) -> Void) {
     self.handle = handle
diff --git a/Sources/ElixxirDAppsSDK/Models/AuthCallback.swift b/Sources/ElixxirDAppsSDK/Models/AuthCallback.swift
new file mode 100644
index 0000000000000000000000000000000000000000..4765f06b6ab354a12ce19fad67f514ee75801a21
--- /dev/null
+++ b/Sources/ElixxirDAppsSDK/Models/AuthCallback.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+public enum AuthCallback {
+  case confirm(contact: Data, receptionId: Data, ephemeralId: Int64, roundId: Int64)
+  case request(contact: Data, receptionId: Data, ephemeralId: Int64, roundId: Int64)
+  case reset(contact: Data, receptionId: Data, ephemeralId: Int64, roundId: Int64)
+}
diff --git a/Sources/ElixxirDAppsSDK/ClientError.swift b/Sources/ElixxirDAppsSDK/Models/ClientError.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientError.swift
rename to Sources/ElixxirDAppsSDK/Models/ClientError.swift
diff --git a/Sources/ElixxirDAppsSDK/Fact.swift b/Sources/ElixxirDAppsSDK/Models/Fact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Fact.swift
rename to Sources/ElixxirDAppsSDK/Models/Fact.swift
diff --git a/Sources/ElixxirDAppsSDK/Message.swift b/Sources/ElixxirDAppsSDK/Models/Message.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Message.swift
rename to Sources/ElixxirDAppsSDK/Models/Message.swift
diff --git a/Sources/ElixxirDAppsSDK/MessageSendReport.swift b/Sources/ElixxirDAppsSDK/Models/MessageSendReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/MessageSendReport.swift
rename to Sources/ElixxirDAppsSDK/Models/MessageSendReport.swift
diff --git a/Sources/ElixxirDAppsSDK/ReceptionIdentity.swift b/Sources/ElixxirDAppsSDK/Models/ReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ReceptionIdentity.swift
rename to Sources/ElixxirDAppsSDK/Models/ReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/RestlikeMessage.swift b/Sources/ElixxirDAppsSDK/Models/RestlikeMessage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/RestlikeMessage.swift
rename to Sources/ElixxirDAppsSDK/Models/RestlikeMessage.swift