diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/XXClient.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/XXClient.xcscheme
new file mode 100644
index 0000000000000000000000000000000000000000..c0fcfabe31600c05dbbb6e33fcd972945a0d23d8
--- /dev/null
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/XXClient.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1340"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "XXClient"
+               BuildableName = "XXClient"
+               BlueprintName = "XXClient"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "XXClientTests"
+               BuildableName = "XXClientTests"
+               BlueprintName = "XXClientTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "XXClient"
+            BuildableName = "XXClient"
+            BlueprintName = "XXClient"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/elixxir-dapps-sdk-swift.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/elixxir-dapps-sdk-swift.xcscheme
index 7947df25183e6584c0337ea453750b8627487af7..c0fcfabe31600c05dbbb6e33fcd972945a0d23d8 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/elixxir-dapps-sdk-swift.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/elixxir-dapps-sdk-swift.xcscheme
@@ -14,23 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ElixxirDAppsSDK"
-               BuildableName = "ElixxirDAppsSDK"
-               BlueprintName = "ElixxirDAppsSDK"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ElixxirDAppsSDKTests"
-               BuildableName = "ElixxirDAppsSDKTests"
-               BlueprintName = "ElixxirDAppsSDKTests"
+               BlueprintIdentifier = "XXClient"
+               BuildableName = "XXClient"
+               BlueprintName = "XXClient"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -47,9 +33,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ElixxirDAppsSDKTests"
-               BuildableName = "ElixxirDAppsSDKTests"
-               BlueprintName = "ElixxirDAppsSDKTests"
+               BlueprintIdentifier = "XXClientTests"
+               BuildableName = "XXClientTests"
+               BlueprintName = "XXClientTests"
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
@@ -75,9 +61,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ElixxirDAppsSDK"
-            BuildableName = "ElixxirDAppsSDK"
-            BlueprintName = "ElixxirDAppsSDK"
+            BlueprintIdentifier = "XXClient"
+            BuildableName = "XXClient"
+            BlueprintName = "XXClient"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
diff --git a/ElixxirDAppsSDK.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElixxirDAppsSDK.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 7499172407fbb20c9303364611dba9cccf0e7509..6829b18147b9023c7dac8a13beb9615666fcb45a 100644
--- a/ElixxirDAppsSDK.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElixxirDAppsSDK.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/combine-schedulers",
       "state" : {
-        "revision" : "f7c8277f05f27a5bfb2f6ecccb0bad126ffcf472",
-        "version" : "0.7.0"
+        "revision" : "8fee20f993e64bbbf22bc3e3f444758ac2d05692",
+        "version" : "0.7.2"
       }
     },
     {
diff --git a/Example/example-app/Package.swift b/Example/example-app/Package.swift
index 001088bb3f9145b8426055ce3d2b3c5a9074cb5c..ec68a31a650f1ce9d1e4fc5a0282894c9e61a5b7 100644
--- a/Example/example-app/Package.swift
+++ b/Example/example-app/Package.swift
@@ -4,10 +4,8 @@ import PackageDescription
 let swiftSettings: [SwiftSetting] = [
   .unsafeFlags(
     [
-      "-Xfrontend",
-      "-debug-time-function-bodies",
-      "-Xfrontend",
-      "-debug-time-expression-type-checking",
+      "-Xfrontend", "-debug-time-function-bodies",
+      "-Xfrontend", "-debug-time-expression-type-checking",
     ],
     .when(configuration: .debug)
   ),
@@ -25,6 +23,9 @@ let package = Package(
     .library(name: "SessionFeature", targets: ["SessionFeature"]),
   ],
   dependencies: [
+    .package(
+      path: "../../"
+    ),
     .package(
       url: "https://github.com/pointfreeco/swift-composable-architecture.git",
       .upToNextMajor(from: "0.39.0")
@@ -33,10 +34,6 @@ let package = Package(
       url: "https://github.com/darrarski/swift-composable-presentation.git",
       .upToNextMajor(from: "0.5.2")
     ),
-    .package(
-      // ElixxirDAppsSDK
-      path: "../../"
-    ),
     .package(
       url: "https://github.com/kishikawakatsumi/KeychainAccess.git",
       .upToNextMajor(from: "4.2.2")
@@ -55,9 +52,9 @@ let package = Package(
         .target(name: "SessionFeature"),
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         .product(name: "ComposablePresentation", package: "swift-composable-presentation"),
-        .product(name: "ElixxirDAppsSDK", package: "elixxir-dapps-sdk-swift"),
         .product(name: "KeychainAccess", package: "KeychainAccess"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "XXClient", package: "elixxir-dapps-sdk-swift"),
       ],
       swiftSettings: swiftSettings
     ),
@@ -72,8 +69,8 @@ let package = Package(
       name: "ErrorFeature",
       dependencies: [
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
-        .product(name: "ElixxirDAppsSDK", package: "elixxir-dapps-sdk-swift"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "XXClient", package: "elixxir-dapps-sdk-swift"),
       ],
       swiftSettings: swiftSettings
     ),
@@ -90,8 +87,8 @@ let package = Package(
         .target(name: "ErrorFeature"),
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         .product(name: "ComposablePresentation", package: "swift-composable-presentation"),
-        .product(name: "ElixxirDAppsSDK", package: "elixxir-dapps-sdk-swift"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "XXClient", package: "elixxir-dapps-sdk-swift"),
       ],
       swiftSettings: swiftSettings
     ),
@@ -108,8 +105,8 @@ let package = Package(
         .target(name: "ErrorFeature"),
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
         .product(name: "ComposablePresentation", package: "swift-composable-presentation"),
-        .product(name: "ElixxirDAppsSDK", package: "elixxir-dapps-sdk-swift"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "XXClient", package: "elixxir-dapps-sdk-swift"),
       ],
       swiftSettings: swiftSettings
     ),
diff --git a/Example/example-app/Sources/AppFeature/App.swift b/Example/example-app/Sources/AppFeature/App.swift
index 3392af19e09a8f7e68bc6341a049bc34bca9b83c..c1fa59417c089cbf3e9371ced8a3bb80225f0b37 100644
--- a/Example/example-app/Sources/AppFeature/App.swift
+++ b/Example/example-app/Sources/AppFeature/App.swift
@@ -1,10 +1,10 @@
 import Combine
 import ComposableArchitecture
-import ElixxirDAppsSDK
 import ErrorFeature
 import LandingFeature
 import SessionFeature
 import SwiftUI
+import XXClient
 
 @main
 struct App: SwiftUI.App {
diff --git a/Example/example-app/Sources/AppFeature/PasswordStorage+Keychain.swift b/Example/example-app/Sources/AppFeature/PasswordStorage+Keychain.swift
index 5eb1a61d6b07cb9197b443f98226b8257b6cc5f9..1b1a26de96c3fc947daf479a4d7eb528754aeada 100644
--- a/Example/example-app/Sources/AppFeature/PasswordStorage+Keychain.swift
+++ b/Example/example-app/Sources/AppFeature/PasswordStorage+Keychain.swift
@@ -1,5 +1,5 @@
-import ElixxirDAppsSDK
 import KeychainAccess
+import XXClient
 
 extension PasswordStorage {
   static let keychain: PasswordStorage = {
diff --git a/Example/example-app/Sources/LandingFeature/LandingFeature.swift b/Example/example-app/Sources/LandingFeature/LandingFeature.swift
index 8de2eb3316acf58cef8f11699def99ccf1604c01..294b53f8ed023f78dd566fd6e5e6581fe4e68e7e 100644
--- a/Example/example-app/Sources/LandingFeature/LandingFeature.swift
+++ b/Example/example-app/Sources/LandingFeature/LandingFeature.swift
@@ -1,8 +1,8 @@
 import Combine
 import ComposableArchitecture
-import ElixxirDAppsSDK
 import ErrorFeature
 import XCTestDynamicOverlay
+import XXClient
 
 public struct LandingState: Equatable {
   public init(
diff --git a/Example/example-app/Sources/SessionFeature/NetworkFollowerStatusView.swift b/Example/example-app/Sources/SessionFeature/NetworkFollowerStatusView.swift
index dbb06c4f6646859cbfe4e1a5b05343d68e10f2a6..7b478312477ca5f898952a4ab50213dd9f3c9b3f 100644
--- a/Example/example-app/Sources/SessionFeature/NetworkFollowerStatusView.swift
+++ b/Example/example-app/Sources/SessionFeature/NetworkFollowerStatusView.swift
@@ -1,5 +1,5 @@
-import ElixxirDAppsSDK
 import SwiftUI
+import XXClient
 
 struct NetworkFollowerStatusView: View {
   var status: NetworkFollowerStatus?
diff --git a/Example/example-app/Sources/SessionFeature/SessionFeature.swift b/Example/example-app/Sources/SessionFeature/SessionFeature.swift
index bdbc1015fe0c0030eaed30b3416677e2521178bc..6e0931cb84253f7dba686529e2fb16f19fec99e2 100644
--- a/Example/example-app/Sources/SessionFeature/SessionFeature.swift
+++ b/Example/example-app/Sources/SessionFeature/SessionFeature.swift
@@ -1,8 +1,8 @@
 import Combine
 import ComposableArchitecture
-import ElixxirDAppsSDK
 import ErrorFeature
 import XCTestDynamicOverlay
+import XXClient
 
 public struct SessionState: Equatable {
   public init(
diff --git a/Example/example-app/Sources/SessionFeature/SessionView.swift b/Example/example-app/Sources/SessionFeature/SessionView.swift
index 395cfcb160067fedc31ec3ddd5200aa6960864e2..d095a4211a67d0e0e6b0c027a40641be66347cfb 100644
--- a/Example/example-app/Sources/SessionFeature/SessionView.swift
+++ b/Example/example-app/Sources/SessionFeature/SessionView.swift
@@ -1,8 +1,8 @@
 import ComposableArchitecture
 import ComposablePresentation
-import ElixxirDAppsSDK
 import ErrorFeature
 import SwiftUI
+import XXClient
 
 public struct SessionView: View {
   public init(store: Store<SessionState, SessionAction>) {
diff --git a/Example/example-app/Tests/SessionFeatureTests/SessionFeatureTests.swift b/Example/example-app/Tests/SessionFeatureTests/SessionFeatureTests.swift
index 5d860648ab0b6d80eb8451ebb8b203d3da959088..33261ec67e11aa5494103216ccc5cdfd6f135eb6 100644
--- a/Example/example-app/Tests/SessionFeatureTests/SessionFeatureTests.swift
+++ b/Example/example-app/Tests/SessionFeatureTests/SessionFeatureTests.swift
@@ -1,7 +1,7 @@
 import ComposableArchitecture
-import ElixxirDAppsSDK
 import ErrorFeature
 import XCTest
+import XXClient
 @testable import SessionFeature
 
 final class SessionFeatureTests: XCTestCase {
diff --git a/Package.swift b/Package.swift
index 4dfa1f2928b8b895d163861cfe40e3d322fcd8db..dc48fcd529e629c9e08e8ca0e05e8a6e0a831355 100644
--- a/Package.swift
+++ b/Package.swift
@@ -5,10 +5,8 @@ import PackageDescription
 let swiftSettings: [SwiftSetting] = [
   .unsafeFlags(
     [
-      "-Xfrontend",
-      "-debug-time-function-bodies",
-      "-Xfrontend",
-      "-debug-time-expression-type-checking",
+      "-Xfrontend", "-debug-time-function-bodies",
+      "-Xfrontend", "-debug-time-expression-type-checking",
     ],
     .when(configuration: .debug)
   ),
@@ -21,7 +19,7 @@ let package = Package(
     .iOS(.v14),
   ],
   products: [
-    .library(name: "ElixxirDAppsSDK", targets: ["ElixxirDAppsSDK"]),
+    .library(name: "XXClient", targets: ["XXClient"]),
   ],
   dependencies: [
     .package(
@@ -35,7 +33,7 @@ let package = Package(
   ],
   targets: [
     .target(
-      name: "ElixxirDAppsSDK",
+      name: "XXClient",
       dependencies: [
         .target(name: "Bindings"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
@@ -43,9 +41,9 @@ let package = Package(
       swiftSettings: swiftSettings
     ),
     .testTarget(
-      name: "ElixxirDAppsSDKTests",
+      name: "XXClientTests",
       dependencies: [
-        .target(name: "ElixxirDAppsSDK"),
+        .target(name: "XXClient"),
         .product(name: "CustomDump", package: "swift-custom-dump"),
       ],
       swiftSettings: swiftSettings
diff --git a/README.md b/README.md
index dc615fe24eb14a2540280bad3408d8fefa4ef1b6..5c0f3d59e1b01968e89e695ea0ce43bf99248313 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ You can find full documentation with step by step guide [here](https://xxdk-dev.
 
 ## 🚀 Quick Start
 
-Add `ElixxirDAppsSDK` library as a dependency to your project using Swift Package Manager.
+Add `XXClient` library as a dependency to your project using Swift Package Manager.
 
 ### ▶️ Instantiating cMix
 
@@ -139,7 +139,7 @@ Open `ElixxirDAppsSDK.xcworkspace` in Xcode (≥13.4).
 ```
 ElixxirDAppsSDK [Xcode Workspace]
  ├─ elixxir-dapps-sdk-swift [Swift Package]
- |   └─ ElixxirDAppsSDK [Library]
+ |   └─ XXClient [Library]
  └─ Example [Xcode Project]
      ├─ ExampleApp (iOS) [iOS App Target]
      ├─ example-app [Swift Package]
@@ -152,7 +152,7 @@ ElixxirDAppsSDK [Xcode Workspace]
 
 ### Build schemes
 
-- Use `exlixxir-dapps-sdk-swift` scheme to build and test the package with `ElixxirDAppsSDK` library.
+- Use `exlixxir-dapps-sdk-swift` scheme to build and test the package.
 - Use `ExampleApp (iOS)` to build and run the example app.
 - Use `example-app` scheme to build and test the example app package with all contained libraries.
 - Use `ExampleAppIcon` scheme with macOS target to build and preview the example app icon.
diff --git a/Sources/ElixxirDAppsSDK/Backup/Backup.swift b/Sources/XXClient/Backup/Backup.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Backup/Backup.swift
rename to Sources/XXClient/Backup/Backup.swift
diff --git a/Sources/ElixxirDAppsSDK/Backup/Functors/BackupAddJson.swift b/Sources/XXClient/Backup/Functors/BackupAddJson.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Backup/Functors/BackupAddJson.swift
rename to Sources/XXClient/Backup/Functors/BackupAddJson.swift
diff --git a/Sources/ElixxirDAppsSDK/Backup/Functors/BackupIsRunning.swift b/Sources/XXClient/Backup/Functors/BackupIsRunning.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Backup/Functors/BackupIsRunning.swift
rename to Sources/XXClient/Backup/Functors/BackupIsRunning.swift
diff --git a/Sources/ElixxirDAppsSDK/Backup/Functors/BackupStop.swift b/Sources/XXClient/Backup/Functors/BackupStop.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Backup/Functors/BackupStop.swift
rename to Sources/XXClient/Backup/Functors/BackupStop.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/CMix.swift b/Sources/XXClient/CMix/CMix.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/CMix.swift
rename to Sources/XXClient/CMix/CMix.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixAddHealthCallback.swift b/Sources/XXClient/CMix/Functors/CMixAddHealthCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixAddHealthCallback.swift
rename to Sources/XXClient/CMix/Functors/CMixAddHealthCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixConnect.swift b/Sources/XXClient/CMix/Functors/CMixConnect.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixConnect.swift
rename to Sources/XXClient/CMix/Functors/CMixConnect.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixGetId.swift b/Sources/XXClient/CMix/Functors/CMixGetId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixGetId.swift
rename to Sources/XXClient/CMix/Functors/CMixGetId.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixGetNodeRegistrationStatus.swift b/Sources/XXClient/CMix/Functors/CMixGetNodeRegistrationStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixGetNodeRegistrationStatus.swift
rename to Sources/XXClient/CMix/Functors/CMixGetNodeRegistrationStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixGetReceptionRegistrationValidationSignature.swift b/Sources/XXClient/CMix/Functors/CMixGetReceptionRegistrationValidationSignature.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixGetReceptionRegistrationValidationSignature.swift
rename to Sources/XXClient/CMix/Functors/CMixGetReceptionRegistrationValidationSignature.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixHasRunningProcesses.swift b/Sources/XXClient/CMix/Functors/CMixHasRunningProcesses.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixHasRunningProcesses.swift
rename to Sources/XXClient/CMix/Functors/CMixHasRunningProcesses.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixIsHealthy.swift b/Sources/XXClient/CMix/Functors/CMixIsHealthy.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixIsHealthy.swift
rename to Sources/XXClient/CMix/Functors/CMixIsHealthy.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixMakeLegacyReceptionIdentity.swift b/Sources/XXClient/CMix/Functors/CMixMakeLegacyReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixMakeLegacyReceptionIdentity.swift
rename to Sources/XXClient/CMix/Functors/CMixMakeLegacyReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixMakeReceptionIdentity.swift b/Sources/XXClient/CMix/Functors/CMixMakeReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixMakeReceptionIdentity.swift
rename to Sources/XXClient/CMix/Functors/CMixMakeReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixNetworkFollowerStatus.swift b/Sources/XXClient/CMix/Functors/CMixNetworkFollowerStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixNetworkFollowerStatus.swift
rename to Sources/XXClient/CMix/Functors/CMixNetworkFollowerStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixRegisterClientErrorCallback.swift b/Sources/XXClient/CMix/Functors/CMixRegisterClientErrorCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixRegisterClientErrorCallback.swift
rename to Sources/XXClient/CMix/Functors/CMixRegisterClientErrorCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixStartNetworkFollower.swift b/Sources/XXClient/CMix/Functors/CMixStartNetworkFollower.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixStartNetworkFollower.swift
rename to Sources/XXClient/CMix/Functors/CMixStartNetworkFollower.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixStopNetworkFollower.swift b/Sources/XXClient/CMix/Functors/CMixStopNetworkFollower.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixStopNetworkFollower.swift
rename to Sources/XXClient/CMix/Functors/CMixStopNetworkFollower.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixWaitForNetwork.swift b/Sources/XXClient/CMix/Functors/CMixWaitForNetwork.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixWaitForNetwork.swift
rename to Sources/XXClient/CMix/Functors/CMixWaitForNetwork.swift
diff --git a/Sources/ElixxirDAppsSDK/CMix/Functors/CMixWaitForRoundResult.swift b/Sources/XXClient/CMix/Functors/CMixWaitForRoundResult.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CMix/Functors/CMixWaitForRoundResult.swift
rename to Sources/XXClient/CMix/Functors/CMixWaitForRoundResult.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManager/CMixManager.swift b/Sources/XXClient/CMixManager/CMixManager.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManager/CMixManager.swift
rename to Sources/XXClient/CMixManager/CMixManager.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerCreate.swift b/Sources/XXClient/CMixManager/Functors/CMixManagerCreate.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerCreate.swift
rename to Sources/XXClient/CMixManager/Functors/CMixManagerCreate.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerHasStorage.swift b/Sources/XXClient/CMixManager/Functors/CMixManagerHasStorage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerHasStorage.swift
rename to Sources/XXClient/CMixManager/Functors/CMixManagerHasStorage.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerLoad.swift b/Sources/XXClient/CMixManager/Functors/CMixManagerLoad.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerLoad.swift
rename to Sources/XXClient/CMixManager/Functors/CMixManagerLoad.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerRemove.swift b/Sources/XXClient/CMixManager/Functors/CMixManagerRemove.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerRemove.swift
rename to Sources/XXClient/CMixManager/Functors/CMixManagerRemove.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerRestore.swift b/Sources/XXClient/CMixManager/Functors/CMixManagerRestore.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManager/Functors/CMixManagerRestore.swift
rename to Sources/XXClient/CMixManager/Functors/CMixManagerRestore.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/AuthCallbacks.swift b/Sources/XXClient/Callbacks/AuthCallbacks.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/AuthCallbacks.swift
rename to Sources/XXClient/Callbacks/AuthCallbacks.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/BroadcastListener.swift b/Sources/XXClient/Callbacks/BroadcastListener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/BroadcastListener.swift
rename to Sources/XXClient/Callbacks/BroadcastListener.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/ClientErrorCallback.swift b/Sources/XXClient/Callbacks/ClientErrorCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/ClientErrorCallback.swift
rename to Sources/XXClient/Callbacks/ClientErrorCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/FileTransferProgressCallback.swift b/Sources/XXClient/Callbacks/FileTransferProgressCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/FileTransferProgressCallback.swift
rename to Sources/XXClient/Callbacks/FileTransferProgressCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/GroupChatProcessor.swift b/Sources/XXClient/Callbacks/GroupChatProcessor.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/GroupChatProcessor.swift
rename to Sources/XXClient/Callbacks/GroupChatProcessor.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/GroupRequest.swift b/Sources/XXClient/Callbacks/GroupRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/GroupRequest.swift
rename to Sources/XXClient/Callbacks/GroupRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/HealthCallback.swift b/Sources/XXClient/Callbacks/HealthCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/HealthCallback.swift
rename to Sources/XXClient/Callbacks/HealthCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/Listener.swift b/Sources/XXClient/Callbacks/Listener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/Listener.swift
rename to Sources/XXClient/Callbacks/Listener.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/LogWriter.swift b/Sources/XXClient/Callbacks/LogWriter.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/LogWriter.swift
rename to Sources/XXClient/Callbacks/LogWriter.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/MessageDeliveryCallback.swift b/Sources/XXClient/Callbacks/MessageDeliveryCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/MessageDeliveryCallback.swift
rename to Sources/XXClient/Callbacks/MessageDeliveryCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/Processor.swift b/Sources/XXClient/Callbacks/Processor.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/Processor.swift
rename to Sources/XXClient/Callbacks/Processor.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/ReceiveFileCallback.swift b/Sources/XXClient/Callbacks/ReceiveFileCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/ReceiveFileCallback.swift
rename to Sources/XXClient/Callbacks/ReceiveFileCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/RestlikeCallback.swift b/Sources/XXClient/Callbacks/RestlikeCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/RestlikeCallback.swift
rename to Sources/XXClient/Callbacks/RestlikeCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/SingleUseCallback.swift b/Sources/XXClient/Callbacks/SingleUseCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/SingleUseCallback.swift
rename to Sources/XXClient/Callbacks/SingleUseCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/SingleUseResponse.swift b/Sources/XXClient/Callbacks/SingleUseResponse.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/SingleUseResponse.swift
rename to Sources/XXClient/Callbacks/SingleUseResponse.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/UdLookupCallback.swift b/Sources/XXClient/Callbacks/UdLookupCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/UdLookupCallback.swift
rename to Sources/XXClient/Callbacks/UdLookupCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/UdNetworkStatus.swift b/Sources/XXClient/Callbacks/UdNetworkStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/UdNetworkStatus.swift
rename to Sources/XXClient/Callbacks/UdNetworkStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/UdSearchCallback.swift b/Sources/XXClient/Callbacks/UdSearchCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/UdSearchCallback.swift
rename to Sources/XXClient/Callbacks/UdSearchCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/Callbacks/UpdateBackupFunc.swift b/Sources/XXClient/Callbacks/UpdateBackupFunc.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Callbacks/UpdateBackupFunc.swift
rename to Sources/XXClient/Callbacks/UpdateBackupFunc.swift
diff --git a/Sources/ElixxirDAppsSDK/Channel/Channel.swift b/Sources/XXClient/Channel/Channel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Channel/Channel.swift
rename to Sources/XXClient/Channel/Channel.swift
diff --git a/Sources/ElixxirDAppsSDK/Channel/Functors/ChannelBroadcast.swift b/Sources/XXClient/Channel/Functors/ChannelBroadcast.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Channel/Functors/ChannelBroadcast.swift
rename to Sources/XXClient/Channel/Functors/ChannelBroadcast.swift
diff --git a/Sources/ElixxirDAppsSDK/Channel/Functors/ChannelBroadcastAsymmetric.swift b/Sources/XXClient/Channel/Functors/ChannelBroadcastAsymmetric.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Channel/Functors/ChannelBroadcastAsymmetric.swift
rename to Sources/XXClient/Channel/Functors/ChannelBroadcastAsymmetric.swift
diff --git a/Sources/ElixxirDAppsSDK/Channel/Functors/ChannelGet.swift b/Sources/XXClient/Channel/Functors/ChannelGet.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Channel/Functors/ChannelGet.swift
rename to Sources/XXClient/Channel/Functors/ChannelGet.swift
diff --git a/Sources/ElixxirDAppsSDK/Channel/Functors/ChannelListen.swift b/Sources/XXClient/Channel/Functors/ChannelListen.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Channel/Functors/ChannelListen.swift
rename to Sources/XXClient/Channel/Functors/ChannelListen.swift
diff --git a/Sources/ElixxirDAppsSDK/Channel/Functors/ChannelMaxAsymmetricPayloadSize.swift b/Sources/XXClient/Channel/Functors/ChannelMaxAsymmetricPayloadSize.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Channel/Functors/ChannelMaxAsymmetricPayloadSize.swift
rename to Sources/XXClient/Channel/Functors/ChannelMaxAsymmetricPayloadSize.swift
diff --git a/Sources/ElixxirDAppsSDK/Channel/Functors/ChannelMaxPayloadSize.swift b/Sources/XXClient/Channel/Functors/ChannelMaxPayloadSize.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Channel/Functors/ChannelMaxPayloadSize.swift
rename to Sources/XXClient/Channel/Functors/ChannelMaxPayloadSize.swift
diff --git a/Sources/ElixxirDAppsSDK/Channel/Functors/ChannelStop.swift b/Sources/XXClient/Channel/Functors/ChannelStop.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Channel/Functors/ChannelStop.swift
rename to Sources/XXClient/Channel/Functors/ChannelStop.swift
diff --git a/Sources/ElixxirDAppsSDK/Connection/Connection.swift b/Sources/XXClient/Connection/Connection.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Connection/Connection.swift
rename to Sources/XXClient/Connection/Connection.swift
diff --git a/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionClose.swift b/Sources/XXClient/Connection/Functors/ConnectionClose.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionClose.swift
rename to Sources/XXClient/Connection/Functors/ConnectionClose.swift
diff --git a/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionGetId.swift b/Sources/XXClient/Connection/Functors/ConnectionGetId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionGetId.swift
rename to Sources/XXClient/Connection/Functors/ConnectionGetId.swift
diff --git a/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionGetPartner.swift b/Sources/XXClient/Connection/Functors/ConnectionGetPartner.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionGetPartner.swift
rename to Sources/XXClient/Connection/Functors/ConnectionGetPartner.swift
diff --git a/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionIsAuthenticated.swift b/Sources/XXClient/Connection/Functors/ConnectionIsAuthenticated.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionIsAuthenticated.swift
rename to Sources/XXClient/Connection/Functors/ConnectionIsAuthenticated.swift
diff --git a/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionRegisterListener.swift b/Sources/XXClient/Connection/Functors/ConnectionRegisterListener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionRegisterListener.swift
rename to Sources/XXClient/Connection/Functors/ConnectionRegisterListener.swift
diff --git a/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionSend.swift b/Sources/XXClient/Connection/Functors/ConnectionSend.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionSend.swift
rename to Sources/XXClient/Connection/Functors/ConnectionSend.swift
diff --git a/Sources/ElixxirDAppsSDK/DummyTraffic/DummyTraffic.swift b/Sources/XXClient/DummyTraffic/DummyTraffic.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/DummyTraffic/DummyTraffic.swift
rename to Sources/XXClient/DummyTraffic/DummyTraffic.swift
diff --git a/Sources/ElixxirDAppsSDK/DummyTraffic/Functors/DummyTrafficGetStatus.swift b/Sources/XXClient/DummyTraffic/Functors/DummyTrafficGetStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/DummyTraffic/Functors/DummyTrafficGetStatus.swift
rename to Sources/XXClient/DummyTraffic/Functors/DummyTrafficGetStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/DummyTraffic/Functors/DummyTrafficSetStatus.swift b/Sources/XXClient/DummyTraffic/Functors/DummyTrafficSetStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/DummyTraffic/Functors/DummyTrafficSetStatus.swift
rename to Sources/XXClient/DummyTraffic/Functors/DummyTrafficSetStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/E2E.swift b/Sources/XXClient/E2E/E2E.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/E2E.swift
rename to Sources/XXClient/E2E/E2E.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EAddPartnerCallback.swift b/Sources/XXClient/E2E/Functors/E2EAddPartnerCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EAddPartnerCallback.swift
rename to Sources/XXClient/E2E/Functors/E2EAddPartnerCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EAddService.swift b/Sources/XXClient/E2E/Functors/E2EAddService.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EAddService.swift
rename to Sources/XXClient/E2E/Functors/E2EAddService.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2ECallAllReceivedRequests.swift b/Sources/XXClient/E2E/Functors/E2ECallAllReceivedRequests.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2ECallAllReceivedRequests.swift
rename to Sources/XXClient/E2E/Functors/E2ECallAllReceivedRequests.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EConfirmReceivedRequest.swift b/Sources/XXClient/E2E/Functors/E2EConfirmReceivedRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EConfirmReceivedRequest.swift
rename to Sources/XXClient/E2E/Functors/E2EConfirmReceivedRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EDeleteRequest.swift b/Sources/XXClient/E2E/Functors/E2EDeleteRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EDeleteRequest.swift
rename to Sources/XXClient/E2E/Functors/E2EDeleteRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetAllPartnerIds.swift b/Sources/XXClient/E2E/Functors/E2EGetAllPartnerIds.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetAllPartnerIds.swift
rename to Sources/XXClient/E2E/Functors/E2EGetAllPartnerIds.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetContact.swift b/Sources/XXClient/E2E/Functors/E2EGetContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetContact.swift
rename to Sources/XXClient/E2E/Functors/E2EGetContact.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetHistoricalDHPrivateKey.swift b/Sources/XXClient/E2E/Functors/E2EGetHistoricalDHPrivateKey.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetHistoricalDHPrivateKey.swift
rename to Sources/XXClient/E2E/Functors/E2EGetHistoricalDHPrivateKey.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetHistoricalDHPublicKey.swift b/Sources/XXClient/E2E/Functors/E2EGetHistoricalDHPublicKey.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetHistoricalDHPublicKey.swift
rename to Sources/XXClient/E2E/Functors/E2EGetHistoricalDHPublicKey.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetId.swift b/Sources/XXClient/E2E/Functors/E2EGetId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetId.swift
rename to Sources/XXClient/E2E/Functors/E2EGetId.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetReceivedRequest.swift b/Sources/XXClient/E2E/Functors/E2EGetReceivedRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetReceivedRequest.swift
rename to Sources/XXClient/E2E/Functors/E2EGetReceivedRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetReceptionId.swift b/Sources/XXClient/E2E/Functors/E2EGetReceptionId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetReceptionId.swift
rename to Sources/XXClient/E2E/Functors/E2EGetReceptionId.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdAddressFromNdf.swift b/Sources/XXClient/E2E/Functors/E2EGetUdAddressFromNdf.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdAddressFromNdf.swift
rename to Sources/XXClient/E2E/Functors/E2EGetUdAddressFromNdf.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdCertFromNdf.swift b/Sources/XXClient/E2E/Functors/E2EGetUdCertFromNdf.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdCertFromNdf.swift
rename to Sources/XXClient/E2E/Functors/E2EGetUdCertFromNdf.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdContactFromNdf.swift b/Sources/XXClient/E2E/Functors/E2EGetUdContactFromNdf.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdContactFromNdf.swift
rename to Sources/XXClient/E2E/Functors/E2EGetUdContactFromNdf.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EHasAuthenticatedChannel.swift b/Sources/XXClient/E2E/Functors/E2EHasAuthenticatedChannel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EHasAuthenticatedChannel.swift
rename to Sources/XXClient/E2E/Functors/E2EHasAuthenticatedChannel.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EPartitionSize.swift b/Sources/XXClient/E2E/Functors/E2EPartitionSize.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EPartitionSize.swift
rename to Sources/XXClient/E2E/Functors/E2EPartitionSize.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EPayloadSize.swift b/Sources/XXClient/E2E/Functors/E2EPayloadSize.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EPayloadSize.swift
rename to Sources/XXClient/E2E/Functors/E2EPayloadSize.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2ERegisterListener.swift b/Sources/XXClient/E2E/Functors/E2ERegisterListener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2ERegisterListener.swift
rename to Sources/XXClient/E2E/Functors/E2ERegisterListener.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2ERemoveService.swift b/Sources/XXClient/E2E/Functors/E2ERemoveService.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2ERemoveService.swift
rename to Sources/XXClient/E2E/Functors/E2ERemoveService.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EReplayConfirmReceivedRequest.swift b/Sources/XXClient/E2E/Functors/E2EReplayConfirmReceivedRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EReplayConfirmReceivedRequest.swift
rename to Sources/XXClient/E2E/Functors/E2EReplayConfirmReceivedRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2ERequestAuthenticatedChannel.swift b/Sources/XXClient/E2E/Functors/E2ERequestAuthenticatedChannel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2ERequestAuthenticatedChannel.swift
rename to Sources/XXClient/E2E/Functors/E2ERequestAuthenticatedChannel.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EResetAuthenticatedChannel.swift b/Sources/XXClient/E2E/Functors/E2EResetAuthenticatedChannel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EResetAuthenticatedChannel.swift
rename to Sources/XXClient/E2E/Functors/E2EResetAuthenticatedChannel.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2ESend.swift b/Sources/XXClient/E2E/Functors/E2ESend.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2ESend.swift
rename to Sources/XXClient/E2E/Functors/E2ESend.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EVerifyOwnership.swift b/Sources/XXClient/E2E/Functors/E2EVerifyOwnership.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E/Functors/E2EVerifyOwnership.swift
rename to Sources/XXClient/E2E/Functors/E2EVerifyOwnership.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/FilePartTracker.swift b/Sources/XXClient/FileTransfer/FilePartTracker.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/FilePartTracker.swift
rename to Sources/XXClient/FileTransfer/FilePartTracker.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/FileTransfer.swift b/Sources/XXClient/FileTransfer/FileTransfer.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/FileTransfer.swift
rename to Sources/XXClient/FileTransfer/FileTransfer.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FilePartTrackerGetNumParts.swift b/Sources/XXClient/FileTransfer/Functors/FilePartTrackerGetNumParts.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FilePartTrackerGetNumParts.swift
rename to Sources/XXClient/FileTransfer/Functors/FilePartTrackerGetNumParts.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FilePartTrackerGetPartStatus.swift b/Sources/XXClient/FileTransfer/Functors/FilePartTrackerGetPartStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FilePartTrackerGetPartStatus.swift
rename to Sources/XXClient/FileTransfer/Functors/FilePartTrackerGetPartStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferCloseSend.swift b/Sources/XXClient/FileTransfer/Functors/FileTransferCloseSend.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferCloseSend.swift
rename to Sources/XXClient/FileTransfer/Functors/FileTransferCloseSend.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferMaxFileSize.swift b/Sources/XXClient/FileTransfer/Functors/FileTransferMaxFileSize.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferMaxFileSize.swift
rename to Sources/XXClient/FileTransfer/Functors/FileTransferMaxFileSize.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferMaxFileTypeLen.swift b/Sources/XXClient/FileTransfer/Functors/FileTransferMaxFileTypeLen.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferMaxFileTypeLen.swift
rename to Sources/XXClient/FileTransfer/Functors/FileTransferMaxFileTypeLen.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferMaxFilenameLen.swift b/Sources/XXClient/FileTransfer/Functors/FileTransferMaxFilenameLen.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferMaxFilenameLen.swift
rename to Sources/XXClient/FileTransfer/Functors/FileTransferMaxFilenameLen.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferMaxPreviewSize.swift b/Sources/XXClient/FileTransfer/Functors/FileTransferMaxPreviewSize.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferMaxPreviewSize.swift
rename to Sources/XXClient/FileTransfer/Functors/FileTransferMaxPreviewSize.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferReceive.swift b/Sources/XXClient/FileTransfer/Functors/FileTransferReceive.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferReceive.swift
rename to Sources/XXClient/FileTransfer/Functors/FileTransferReceive.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferRegisterReceivedProgressCallback.swift b/Sources/XXClient/FileTransfer/Functors/FileTransferRegisterReceivedProgressCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferRegisterReceivedProgressCallback.swift
rename to Sources/XXClient/FileTransfer/Functors/FileTransferRegisterReceivedProgressCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferRegisterSentProgressCallback.swift b/Sources/XXClient/FileTransfer/Functors/FileTransferRegisterSentProgressCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferRegisterSentProgressCallback.swift
rename to Sources/XXClient/FileTransfer/Functors/FileTransferRegisterSentProgressCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferSend.swift b/Sources/XXClient/FileTransfer/Functors/FileTransferSend.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/FileTransfer/Functors/FileTransferSend.swift
rename to Sources/XXClient/FileTransfer/Functors/FileTransferSend.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/AsyncRequestRestlike.swift b/Sources/XXClient/Functors/AsyncRequestRestlike.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/AsyncRequestRestlike.swift
rename to Sources/XXClient/Functors/AsyncRequestRestlike.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/CreateUserFriendlyErrorMessage.swift b/Sources/XXClient/Functors/CreateUserFriendlyErrorMessage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/CreateUserFriendlyErrorMessage.swift
rename to Sources/XXClient/Functors/CreateUserFriendlyErrorMessage.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/DownloadAndVerifySignedNdf.swift b/Sources/XXClient/Functors/DownloadAndVerifySignedNdf.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/DownloadAndVerifySignedNdf.swift
rename to Sources/XXClient/Functors/DownloadAndVerifySignedNdf.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/EnableGrpcLogs.swift b/Sources/XXClient/Functors/EnableGrpcLogs.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/EnableGrpcLogs.swift
rename to Sources/XXClient/Functors/EnableGrpcLogs.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GenerateSecret.swift b/Sources/XXClient/Functors/GenerateSecret.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GenerateSecret.swift
rename to Sources/XXClient/Functors/GenerateSecret.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetCMixParams.swift b/Sources/XXClient/Functors/GetCMixParams.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetCMixParams.swift
rename to Sources/XXClient/Functors/GetCMixParams.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetDependencies.swift b/Sources/XXClient/Functors/GetDependencies.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetDependencies.swift
rename to Sources/XXClient/Functors/GetDependencies.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetE2EFileTransferParams.swift b/Sources/XXClient/Functors/GetE2EFileTransferParams.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetE2EFileTransferParams.swift
rename to Sources/XXClient/Functors/GetE2EFileTransferParams.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetE2EParams.swift b/Sources/XXClient/Functors/GetE2EParams.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetE2EParams.swift
rename to Sources/XXClient/Functors/GetE2EParams.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetFactsFromContact.swift b/Sources/XXClient/Functors/GetFactsFromContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetFactsFromContact.swift
rename to Sources/XXClient/Functors/GetFactsFromContact.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetFileTransferParams.swift b/Sources/XXClient/Functors/GetFileTransferParams.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetFileTransferParams.swift
rename to Sources/XXClient/Functors/GetFileTransferParams.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetGitVersion.swift b/Sources/XXClient/Functors/GetGitVersion.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetGitVersion.swift
rename to Sources/XXClient/Functors/GetGitVersion.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetIdFromContact.swift b/Sources/XXClient/Functors/GetIdFromContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetIdFromContact.swift
rename to Sources/XXClient/Functors/GetIdFromContact.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetPublicKeyFromContact.swift b/Sources/XXClient/Functors/GetPublicKeyFromContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetPublicKeyFromContact.swift
rename to Sources/XXClient/Functors/GetPublicKeyFromContact.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetSingleUseParams.swift b/Sources/XXClient/Functors/GetSingleUseParams.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetSingleUseParams.swift
rename to Sources/XXClient/Functors/GetSingleUseParams.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/GetVersion.swift b/Sources/XXClient/Functors/GetVersion.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/GetVersion.swift
rename to Sources/XXClient/Functors/GetVersion.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/InitFileTransfer.swift b/Sources/XXClient/Functors/InitFileTransfer.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/InitFileTransfer.swift
rename to Sources/XXClient/Functors/InitFileTransfer.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/InitializeBackup.swift b/Sources/XXClient/Functors/InitializeBackup.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/InitializeBackup.swift
rename to Sources/XXClient/Functors/InitializeBackup.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/IsRegisteredWithUD.swift b/Sources/XXClient/Functors/IsRegisteredWithUD.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/IsRegisteredWithUD.swift
rename to Sources/XXClient/Functors/IsRegisteredWithUD.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/Listen.swift b/Sources/XXClient/Functors/Listen.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/Listen.swift
rename to Sources/XXClient/Functors/Listen.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/LoadCMix.swift b/Sources/XXClient/Functors/LoadCMix.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/LoadCMix.swift
rename to Sources/XXClient/Functors/LoadCMix.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/LoadReceptionIdentity.swift b/Sources/XXClient/Functors/LoadReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/LoadReceptionIdentity.swift
rename to Sources/XXClient/Functors/LoadReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/Login.swift b/Sources/XXClient/Functors/Login.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/Login.swift
rename to Sources/XXClient/Functors/Login.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/LookupUD.swift b/Sources/XXClient/Functors/LookupUD.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/LookupUD.swift
rename to Sources/XXClient/Functors/LookupUD.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/NewBroadcastChannel.swift b/Sources/XXClient/Functors/NewBroadcastChannel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/NewBroadcastChannel.swift
rename to Sources/XXClient/Functors/NewBroadcastChannel.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/NewCMix.swift b/Sources/XXClient/Functors/NewCMix.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/NewCMix.swift
rename to Sources/XXClient/Functors/NewCMix.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/NewCMixFromBackup.swift b/Sources/XXClient/Functors/NewCMixFromBackup.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/NewCMixFromBackup.swift
rename to Sources/XXClient/Functors/NewCMixFromBackup.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/NewDummyTrafficManager.swift b/Sources/XXClient/Functors/NewDummyTrafficManager.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/NewDummyTrafficManager.swift
rename to Sources/XXClient/Functors/NewDummyTrafficManager.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/NewGroupChat.swift b/Sources/XXClient/Functors/NewGroupChat.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/NewGroupChat.swift
rename to Sources/XXClient/Functors/NewGroupChat.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/NewOrLoadUd.swift b/Sources/XXClient/Functors/NewOrLoadUd.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/NewOrLoadUd.swift
rename to Sources/XXClient/Functors/NewOrLoadUd.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/NewUdManagerFromBackup.swift b/Sources/XXClient/Functors/NewUdManagerFromBackup.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/NewUdManagerFromBackup.swift
rename to Sources/XXClient/Functors/NewUdManagerFromBackup.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/RegisterForNotifications.swift b/Sources/XXClient/Functors/RegisterForNotifications.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/RegisterForNotifications.swift
rename to Sources/XXClient/Functors/RegisterForNotifications.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/RegisterLogWriter.swift b/Sources/XXClient/Functors/RegisterLogWriter.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/RegisterLogWriter.swift
rename to Sources/XXClient/Functors/RegisterLogWriter.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/RequestRestlike.swift b/Sources/XXClient/Functors/RequestRestlike.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/RequestRestlike.swift
rename to Sources/XXClient/Functors/RequestRestlike.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/RestlikeRequest.swift b/Sources/XXClient/Functors/RestlikeRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/RestlikeRequest.swift
rename to Sources/XXClient/Functors/RestlikeRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/ResumeBackup.swift b/Sources/XXClient/Functors/ResumeBackup.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/ResumeBackup.swift
rename to Sources/XXClient/Functors/ResumeBackup.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/SearchUD.swift b/Sources/XXClient/Functors/SearchUD.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/SearchUD.swift
rename to Sources/XXClient/Functors/SearchUD.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/SetFactsOnContact.swift b/Sources/XXClient/Functors/SetFactsOnContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/SetFactsOnContact.swift
rename to Sources/XXClient/Functors/SetFactsOnContact.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/SetLogLevel.swift b/Sources/XXClient/Functors/SetLogLevel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/SetLogLevel.swift
rename to Sources/XXClient/Functors/SetLogLevel.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/StoreReceptionIdentity.swift b/Sources/XXClient/Functors/StoreReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/StoreReceptionIdentity.swift
rename to Sources/XXClient/Functors/StoreReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/TransmitSingleUse.swift b/Sources/XXClient/Functors/TransmitSingleUse.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/TransmitSingleUse.swift
rename to Sources/XXClient/Functors/TransmitSingleUse.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/UnregisterForNotifications.swift b/Sources/XXClient/Functors/UnregisterForNotifications.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/UnregisterForNotifications.swift
rename to Sources/XXClient/Functors/UnregisterForNotifications.swift
diff --git a/Sources/ElixxirDAppsSDK/Functors/UpdateCommonErrors.swift b/Sources/XXClient/Functors/UpdateCommonErrors.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Functors/UpdateCommonErrors.swift
rename to Sources/XXClient/Functors/UpdateCommonErrors.swift
diff --git a/Sources/ElixxirDAppsSDK/Group/Functors/GroupGetCreatedMS.swift b/Sources/XXClient/Group/Functors/GroupGetCreatedMS.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Group/Functors/GroupGetCreatedMS.swift
rename to Sources/XXClient/Group/Functors/GroupGetCreatedMS.swift
diff --git a/Sources/ElixxirDAppsSDK/Group/Functors/GroupGetCreatedNano.swift b/Sources/XXClient/Group/Functors/GroupGetCreatedNano.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Group/Functors/GroupGetCreatedNano.swift
rename to Sources/XXClient/Group/Functors/GroupGetCreatedNano.swift
diff --git a/Sources/ElixxirDAppsSDK/Group/Functors/GroupGetId.swift b/Sources/XXClient/Group/Functors/GroupGetId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Group/Functors/GroupGetId.swift
rename to Sources/XXClient/Group/Functors/GroupGetId.swift
diff --git a/Sources/ElixxirDAppsSDK/Group/Functors/GroupGetInitMessage.swift b/Sources/XXClient/Group/Functors/GroupGetInitMessage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Group/Functors/GroupGetInitMessage.swift
rename to Sources/XXClient/Group/Functors/GroupGetInitMessage.swift
diff --git a/Sources/ElixxirDAppsSDK/Group/Functors/GroupGetMembership.swift b/Sources/XXClient/Group/Functors/GroupGetMembership.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Group/Functors/GroupGetMembership.swift
rename to Sources/XXClient/Group/Functors/GroupGetMembership.swift
diff --git a/Sources/ElixxirDAppsSDK/Group/Functors/GroupGetName.swift b/Sources/XXClient/Group/Functors/GroupGetName.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Group/Functors/GroupGetName.swift
rename to Sources/XXClient/Group/Functors/GroupGetName.swift
diff --git a/Sources/ElixxirDAppsSDK/Group/Functors/GroupGetTrackedId.swift b/Sources/XXClient/Group/Functors/GroupGetTrackedId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Group/Functors/GroupGetTrackedId.swift
rename to Sources/XXClient/Group/Functors/GroupGetTrackedId.swift
diff --git a/Sources/ElixxirDAppsSDK/Group/Functors/GroupSerialize.swift b/Sources/XXClient/Group/Functors/GroupSerialize.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Group/Functors/GroupSerialize.swift
rename to Sources/XXClient/Group/Functors/GroupSerialize.swift
diff --git a/Sources/ElixxirDAppsSDK/Group/Group.swift b/Sources/XXClient/Group/Group.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Group/Group.swift
rename to Sources/XXClient/Group/Group.swift
diff --git a/Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatGetGroup.swift b/Sources/XXClient/GroupChat/Functors/GroupChatGetGroup.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatGetGroup.swift
rename to Sources/XXClient/GroupChat/Functors/GroupChatGetGroup.swift
diff --git a/Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatGetGroups.swift b/Sources/XXClient/GroupChat/Functors/GroupChatGetGroups.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatGetGroups.swift
rename to Sources/XXClient/GroupChat/Functors/GroupChatGetGroups.swift
diff --git a/Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatJoinGroup.swift b/Sources/XXClient/GroupChat/Functors/GroupChatJoinGroup.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatJoinGroup.swift
rename to Sources/XXClient/GroupChat/Functors/GroupChatJoinGroup.swift
diff --git a/Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatLeaveGroup.swift b/Sources/XXClient/GroupChat/Functors/GroupChatLeaveGroup.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatLeaveGroup.swift
rename to Sources/XXClient/GroupChat/Functors/GroupChatLeaveGroup.swift
diff --git a/Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatMakeGroup.swift b/Sources/XXClient/GroupChat/Functors/GroupChatMakeGroup.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatMakeGroup.swift
rename to Sources/XXClient/GroupChat/Functors/GroupChatMakeGroup.swift
diff --git a/Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatNumGroups.swift b/Sources/XXClient/GroupChat/Functors/GroupChatNumGroups.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatNumGroups.swift
rename to Sources/XXClient/GroupChat/Functors/GroupChatNumGroups.swift
diff --git a/Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatResendRequest.swift b/Sources/XXClient/GroupChat/Functors/GroupChatResendRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatResendRequest.swift
rename to Sources/XXClient/GroupChat/Functors/GroupChatResendRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatSend.swift b/Sources/XXClient/GroupChat/Functors/GroupChatSend.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GroupChat/Functors/GroupChatSend.swift
rename to Sources/XXClient/GroupChat/Functors/GroupChatSend.swift
diff --git a/Sources/ElixxirDAppsSDK/GroupChat/GroupChat.swift b/Sources/XXClient/GroupChat/GroupChat.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GroupChat/GroupChat.swift
rename to Sources/XXClient/GroupChat/GroupChat.swift
diff --git a/Sources/ElixxirDAppsSDK/Helpers/Cancellable.swift b/Sources/XXClient/Helpers/Cancellable.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Helpers/Cancellable.swift
rename to Sources/XXClient/Helpers/Cancellable.swift
diff --git a/Sources/ElixxirDAppsSDK/Helpers/PasswordStorage.swift b/Sources/XXClient/Helpers/PasswordStorage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Helpers/PasswordStorage.swift
rename to Sources/XXClient/Helpers/PasswordStorage.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/BackupReport.swift b/Sources/XXClient/Models/BackupReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/BackupReport.swift
rename to Sources/XXClient/Models/BackupReport.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/BroadcastMessage.swift b/Sources/XXClient/Models/BroadcastMessage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/BroadcastMessage.swift
rename to Sources/XXClient/Models/BroadcastMessage.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/BroadcastReport.swift b/Sources/XXClient/Models/BroadcastReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/BroadcastReport.swift
rename to Sources/XXClient/Models/BroadcastReport.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/ChannelDef.swift b/Sources/XXClient/Models/ChannelDef.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/ChannelDef.swift
rename to Sources/XXClient/Models/ChannelDef.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/ClientError.swift b/Sources/XXClient/Models/ClientError.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/ClientError.swift
rename to Sources/XXClient/Models/ClientError.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/E2ESendReport.swift b/Sources/XXClient/Models/E2ESendReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/E2ESendReport.swift
rename to Sources/XXClient/Models/E2ESendReport.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/Environment.swift b/Sources/XXClient/Models/Environment.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/Environment.swift
rename to Sources/XXClient/Models/Environment.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/EventReport.swift b/Sources/XXClient/Models/EventReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/EventReport.swift
rename to Sources/XXClient/Models/EventReport.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/Fact.swift b/Sources/XXClient/Models/Fact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/Fact.swift
rename to Sources/XXClient/Models/Fact.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/FilePartStatus.swift b/Sources/XXClient/Models/FilePartStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/FilePartStatus.swift
rename to Sources/XXClient/Models/FilePartStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/FileSend.swift b/Sources/XXClient/Models/FileSend.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/FileSend.swift
rename to Sources/XXClient/Models/FileSend.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/GroupReport.swift b/Sources/XXClient/Models/GroupReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/GroupReport.swift
rename to Sources/XXClient/Models/GroupReport.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/GroupSendReport.swift b/Sources/XXClient/Models/GroupSendReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/GroupSendReport.swift
rename to Sources/XXClient/Models/GroupSendReport.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/LogLevel.swift b/Sources/XXClient/Models/LogLevel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/LogLevel.swift
rename to Sources/XXClient/Models/LogLevel.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/Message.swift b/Sources/XXClient/Models/Message.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/Message.swift
rename to Sources/XXClient/Models/Message.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/NetworkFollowerStatus.swift b/Sources/XXClient/Models/NetworkFollowerStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/NetworkFollowerStatus.swift
rename to Sources/XXClient/Models/NetworkFollowerStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/NodeRegistrationReport.swift b/Sources/XXClient/Models/NodeRegistrationReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/NodeRegistrationReport.swift
rename to Sources/XXClient/Models/NodeRegistrationReport.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/Progress.swift b/Sources/XXClient/Models/Progress.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/Progress.swift
rename to Sources/XXClient/Models/Progress.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/ReceivedFile.swift b/Sources/XXClient/Models/ReceivedFile.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/ReceivedFile.swift
rename to Sources/XXClient/Models/ReceivedFile.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/ReceptionIdentity.swift b/Sources/XXClient/Models/ReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/ReceptionIdentity.swift
rename to Sources/XXClient/Models/ReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/RestlikeMessage.swift b/Sources/XXClient/Models/RestlikeMessage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/RestlikeMessage.swift
rename to Sources/XXClient/Models/RestlikeMessage.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/SingleUseCallbackReport.swift b/Sources/XXClient/Models/SingleUseCallbackReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/SingleUseCallbackReport.swift
rename to Sources/XXClient/Models/SingleUseCallbackReport.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/SingleUseResponseReport.swift b/Sources/XXClient/Models/SingleUseResponseReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/SingleUseResponseReport.swift
rename to Sources/XXClient/Models/SingleUseResponseReport.swift
diff --git a/Sources/ElixxirDAppsSDK/Models/SingleUseSendReport.swift b/Sources/XXClient/Models/SingleUseSendReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Models/SingleUseSendReport.swift
rename to Sources/XXClient/Models/SingleUseSendReport.swift
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryConfirmFact.swift b/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryConfirmFact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryConfirmFact.swift
rename to Sources/XXClient/UserDiscovery/Functors/UserDiscoveryConfirmFact.swift
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryGetContact.swift b/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryGetContact.swift
rename to Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetContact.swift
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryGetFacts.swift b/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetFacts.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryGetFacts.swift
rename to Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetFacts.swift
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryGetId.swift b/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryGetId.swift
rename to Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetId.swift
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryPermanentDeleteAccount.swift b/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryPermanentDeleteAccount.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryPermanentDeleteAccount.swift
rename to Sources/XXClient/UserDiscovery/Functors/UserDiscoveryPermanentDeleteAccount.swift
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryRemoveFact.swift b/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryRemoveFact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoveryRemoveFact.swift
rename to Sources/XXClient/UserDiscovery/Functors/UserDiscoveryRemoveFact.swift
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoverySendRegisterFact.swift b/Sources/XXClient/UserDiscovery/Functors/UserDiscoverySendRegisterFact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoverySendRegisterFact.swift
rename to Sources/XXClient/UserDiscovery/Functors/UserDiscoverySendRegisterFact.swift
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/UserDiscovery.swift b/Sources/XXClient/UserDiscovery/UserDiscovery.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/UserDiscovery/UserDiscovery.swift
rename to Sources/XXClient/UserDiscovery/UserDiscovery.swift
diff --git a/Tests/ElixxirDAppsSDKTests/Models/BackupReportTests.swift b/Tests/XXClientTests/Models/BackupReportTests.swift
similarity index 96%
rename from Tests/ElixxirDAppsSDKTests/Models/BackupReportTests.swift
rename to Tests/XXClientTests/Models/BackupReportTests.swift
index 5fb9912849c9309d7fd86cf79a3579a9027a93d0..eb44a64d3e17664eeaa8be1856e8718022518318 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/BackupReportTests.swift
+++ b/Tests/XXClientTests/Models/BackupReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class BackupReportTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/BroadcastMessageTests.swift b/Tests/XXClientTests/Models/BroadcastMessageTests.swift
similarity index 96%
rename from Tests/ElixxirDAppsSDKTests/Models/BroadcastMessageTests.swift
rename to Tests/XXClientTests/Models/BroadcastMessageTests.swift
index 3b6fa7ab7841365647fed1755575612cadcc25b4..13c676ec18fa5e015a2484d74eb575892700bcc2 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/BroadcastMessageTests.swift
+++ b/Tests/XXClientTests/Models/BroadcastMessageTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class BroadcastMessageTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/BroadcastReportTests.swift b/Tests/XXClientTests/Models/BroadcastReportTests.swift
similarity index 95%
rename from Tests/ElixxirDAppsSDKTests/Models/BroadcastReportTests.swift
rename to Tests/XXClientTests/Models/BroadcastReportTests.swift
index c354553ca641f0d6f1ebcc5584533ec247ddb9dd..846657bb1afcbef64279732c9ab1096fe1c6240d 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/BroadcastReportTests.swift
+++ b/Tests/XXClientTests/Models/BroadcastReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class BroadcastReportTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/ChannelDefTests.swift b/Tests/XXClientTests/Models/ChannelDefTests.swift
similarity index 96%
rename from Tests/ElixxirDAppsSDKTests/Models/ChannelDefTests.swift
rename to Tests/XXClientTests/Models/ChannelDefTests.swift
index 0c3bdc9066b9cebdbd17911a165f35eb7dfaaf1b..18b9dff21d6ebc0b087e2ff50426ecf287f6c083 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/ChannelDefTests.swift
+++ b/Tests/XXClientTests/Models/ChannelDefTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class ChannelDefTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/E2ESendReportTests.swift b/Tests/XXClientTests/Models/E2ESendReportTests.swift
similarity index 97%
rename from Tests/ElixxirDAppsSDKTests/Models/E2ESendReportTests.swift
rename to Tests/XXClientTests/Models/E2ESendReportTests.swift
index db3bdd3bac97e7e5ff2e1830abe19fd4f6ec230a..cbde1a38314e4f6f20977efe7b09054906564ed6 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/E2ESendReportTests.swift
+++ b/Tests/XXClientTests/Models/E2ESendReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class E2ESendReportTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/EventReportTests.swift b/Tests/XXClientTests/Models/EventReportTests.swift
similarity index 96%
rename from Tests/ElixxirDAppsSDKTests/Models/EventReportTests.swift
rename to Tests/XXClientTests/Models/EventReportTests.swift
index 22307d4e431ff798cfa9e25124685a759fc74c45..ce25074cda28ba03767d52eea7ccac3ee98122a2 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/EventReportTests.swift
+++ b/Tests/XXClientTests/Models/EventReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class EventReportTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/FactTests.swift b/Tests/XXClientTests/Models/FactTests.swift
similarity index 94%
rename from Tests/ElixxirDAppsSDKTests/Models/FactTests.swift
rename to Tests/XXClientTests/Models/FactTests.swift
index f07fdde6f640d46bc57929ef83e26de4bb15367a..fbe588c534f2edf4a758e1fc32ee96ff789c4dd7 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/FactTests.swift
+++ b/Tests/XXClientTests/Models/FactTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class FactTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/FileSendTests.swift b/Tests/XXClientTests/Models/FileSendTests.swift
similarity index 96%
rename from Tests/ElixxirDAppsSDKTests/Models/FileSendTests.swift
rename to Tests/XXClientTests/Models/FileSendTests.swift
index d0fbf2752cf82f411964343b5ae26f4dc96c9e60..95de659b1fa37cad40c7a2163fbca00e711af045 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/FileSendTests.swift
+++ b/Tests/XXClientTests/Models/FileSendTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class FileSendTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/GroupReportTests.swift b/Tests/XXClientTests/Models/GroupReportTests.swift
similarity index 95%
rename from Tests/ElixxirDAppsSDKTests/Models/GroupReportTests.swift
rename to Tests/XXClientTests/Models/GroupReportTests.swift
index d89542e7fc7ed3e8b00d8f3c4a740b37d815aed0..fbdf17f4cc93d02fddced935e5cb2bc5fe40f723 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/GroupReportTests.swift
+++ b/Tests/XXClientTests/Models/GroupReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class GroupReportTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/GroupSendReportTests.swift b/Tests/XXClientTests/Models/GroupSendReportTests.swift
similarity index 96%
rename from Tests/ElixxirDAppsSDKTests/Models/GroupSendReportTests.swift
rename to Tests/XXClientTests/Models/GroupSendReportTests.swift
index 8d99647c9432d5ff88ddc57738ebab00d48db9d3..b8addf78fdab01a066f095ab5c574ad84a73c4e1 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/GroupSendReportTests.swift
+++ b/Tests/XXClientTests/Models/GroupSendReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class GroupSendReportTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift b/Tests/XXClientTests/Models/MessageTests.swift
similarity index 97%
rename from Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift
rename to Tests/XXClientTests/Models/MessageTests.swift
index ba9f63df2857d76d5b3004c2151d518e955e1d82..b62cf20f1254fac05f88b33227dec438bab4563c 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift
+++ b/Tests/XXClientTests/Models/MessageTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class MessageTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/NodeRegistrationReportTests.swift b/Tests/XXClientTests/Models/NodeRegistrationReportTests.swift
similarity index 96%
rename from Tests/ElixxirDAppsSDKTests/Models/NodeRegistrationReportTests.swift
rename to Tests/XXClientTests/Models/NodeRegistrationReportTests.swift
index 8411aa5b3fa5288b786c8196feb03e1322eb4ac2..65510d3d0f01057ec03ab797dfaa43bf9e1d094f 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/NodeRegistrationReportTests.swift
+++ b/Tests/XXClientTests/Models/NodeRegistrationReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class NodeRegistrationReportTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/ProgressTests.swift b/Tests/XXClientTests/Models/ProgressTests.swift
similarity index 97%
rename from Tests/ElixxirDAppsSDKTests/Models/ProgressTests.swift
rename to Tests/XXClientTests/Models/ProgressTests.swift
index 557eac6840f3e356066252bb331d83b54fa1c7fc..35a083c202a1e3d35b6c75860b9f8aa3b39d0d69 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/ProgressTests.swift
+++ b/Tests/XXClientTests/Models/ProgressTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class ProgressTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/ReceivedFileTests.swift b/Tests/XXClientTests/Models/ReceivedFileTests.swift
similarity index 97%
rename from Tests/ElixxirDAppsSDKTests/Models/ReceivedFileTests.swift
rename to Tests/XXClientTests/Models/ReceivedFileTests.swift
index f04720e525d074f9307e36e54464b6bd5fa62e8a..2a967cb9ad11742bb871f864cc442c77a0f84070 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/ReceivedFileTests.swift
+++ b/Tests/XXClientTests/Models/ReceivedFileTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class ReceivedFileTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift b/Tests/XXClientTests/Models/ReceptionIdentityTests.swift
similarity index 99%
rename from Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift
rename to Tests/XXClientTests/Models/ReceptionIdentityTests.swift
index 710b982eda7fbfac24baf033ed27bbfcfb082b56..967a7392481ec0cea8809c8c5759e269befe79b2 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift
+++ b/Tests/XXClientTests/Models/ReceptionIdentityTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class ReceptionIdentityTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift b/Tests/XXClientTests/Models/RestlikeMessageTests.swift
similarity index 96%
rename from Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift
rename to Tests/XXClientTests/Models/RestlikeMessageTests.swift
index 7fca8d7267ac87d8936cb0dbc4a5826cb5a5f076..9a8b9db89d2ef70b75a110416f6c775daba49b75 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift
+++ b/Tests/XXClientTests/Models/RestlikeMessageTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class RestlikeMessageTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/SingleUseCallbackReportTests.swift b/Tests/XXClientTests/Models/SingleUseCallbackReportTests.swift
similarity index 97%
rename from Tests/ElixxirDAppsSDKTests/Models/SingleUseCallbackReportTests.swift
rename to Tests/XXClientTests/Models/SingleUseCallbackReportTests.swift
index 9ec6e42b82df25d53709f163762ee38b903db376..b0b22284a301ab7bda575c45605bc03bde7616c3 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/SingleUseCallbackReportTests.swift
+++ b/Tests/XXClientTests/Models/SingleUseCallbackReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class SingleUseCallbackReportTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/SingleUseResponseReportTests.swift b/Tests/XXClientTests/Models/SingleUseResponseReportTests.swift
similarity index 98%
rename from Tests/ElixxirDAppsSDKTests/Models/SingleUseResponseReportTests.swift
rename to Tests/XXClientTests/Models/SingleUseResponseReportTests.swift
index 34750c20f6bc4d6cf824e7566f8f1aa3b89e6d29..087ac8cfc02f2c596ed8a6d8fac92288370221e7 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/SingleUseResponseReportTests.swift
+++ b/Tests/XXClientTests/Models/SingleUseResponseReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class SingleUseResponseReportTests: XCTestCase {
   func testCoding() throws {
diff --git a/Tests/ElixxirDAppsSDKTests/Models/SingleUseSendReportTests.swift b/Tests/XXClientTests/Models/SingleUseSendReportTests.swift
similarity index 96%
rename from Tests/ElixxirDAppsSDKTests/Models/SingleUseSendReportTests.swift
rename to Tests/XXClientTests/Models/SingleUseSendReportTests.swift
index 048af7d445c8542ad6872260520c568328363a84..07a836d9cf10f43ddfe4a9b445dd3870aac39253 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/SingleUseSendReportTests.swift
+++ b/Tests/XXClientTests/Models/SingleUseSendReportTests.swift
@@ -1,6 +1,6 @@
 import CustomDump
 import XCTest
-@testable import ElixxirDAppsSDK
+@testable import XXClient
 
 final class SingleUseSendReportTests: XCTestCase {
   func testCoding() throws {