diff --git a/Sources/ElixxirDAppsSDK/Cancellable.swift b/Sources/ElixxirDAppsSDK/Legacy/Cancellable.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Cancellable.swift
rename to Sources/ElixxirDAppsSDK/Legacy/Cancellable.swift
diff --git a/Sources/ElixxirDAppsSDK/Client.swift b/Sources/ElixxirDAppsSDK/Legacy/Client.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Client.swift
rename to Sources/ElixxirDAppsSDK/Legacy/Client.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientCreator.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientCreator.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientCreator.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientCreator.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientE2E.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientE2E.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientE2E.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientE2E.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientE2EIdProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientE2EIdProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientE2EIdProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientE2EIdProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientE2ELogin.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientE2ELogin.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientE2ELogin.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientE2ELogin.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientError.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientError.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientError.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientError.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientErrorListener.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientErrorListener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientErrorListener.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientErrorListener.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientIdProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientIdProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientIdProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientIdProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientLoader.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientLoader.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientLoader.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientLoader.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientProcessStatusProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientProcessStatusProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientProcessStatusProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientProcessStatusProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientStorage.swift b/Sources/ElixxirDAppsSDK/Legacy/ClientStorage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientStorage.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ClientStorage.swift
diff --git a/Sources/ElixxirDAppsSDK/Connection.swift b/Sources/ElixxirDAppsSDK/Legacy/Connection.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Connection.swift
rename to Sources/ElixxirDAppsSDK/Legacy/Connection.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionAuthStatusProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ConnectionAuthStatusProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionAuthStatusProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ConnectionAuthStatusProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionCloser.swift b/Sources/ElixxirDAppsSDK/Legacy/ConnectionCloser.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionCloser.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ConnectionCloser.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionIdProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ConnectionIdProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionIdProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ConnectionIdProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionMaker.swift b/Sources/ElixxirDAppsSDK/Legacy/ConnectionMaker.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionMaker.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ConnectionMaker.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionPartnerProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ConnectionPartnerProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionPartnerProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ConnectionPartnerProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/ContactFactsProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ContactFactsProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ContactFactsProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ContactFactsProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/ContactFactsSetter.swift b/Sources/ElixxirDAppsSDK/Legacy/ContactFactsSetter.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ContactFactsSetter.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ContactFactsSetter.swift
diff --git a/Sources/ElixxirDAppsSDK/ContactFromIdentityProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ContactFromIdentityProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ContactFromIdentityProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ContactFromIdentityProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/ContactIdProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ContactIdProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ContactIdProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ContactIdProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/ContactPubkeyProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/ContactPubkeyProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ContactPubkeyProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/ContactPubkeyProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/DependenciesProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/DependenciesProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/DependenciesProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/DependenciesProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/Environment.swift b/Sources/ElixxirDAppsSDK/Legacy/Environment.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Environment.swift
rename to Sources/ElixxirDAppsSDK/Legacy/Environment.swift
diff --git a/Sources/ElixxirDAppsSDK/Fact.swift b/Sources/ElixxirDAppsSDK/Legacy/Fact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Fact.swift
rename to Sources/ElixxirDAppsSDK/Legacy/Fact.swift
diff --git a/Sources/ElixxirDAppsSDK/GitVersionProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/GitVersionProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GitVersionProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/GitVersionProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/Identity.swift b/Sources/ElixxirDAppsSDK/Legacy/Identity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Identity.swift
rename to Sources/ElixxirDAppsSDK/Legacy/Identity.swift
diff --git a/Sources/ElixxirDAppsSDK/IdentityMaker.swift b/Sources/ElixxirDAppsSDK/Legacy/IdentityMaker.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/IdentityMaker.swift
rename to Sources/ElixxirDAppsSDK/Legacy/IdentityMaker.swift
diff --git a/Sources/ElixxirDAppsSDK/LogLevel.swift b/Sources/ElixxirDAppsSDK/Legacy/LogLevel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/LogLevel.swift
rename to Sources/ElixxirDAppsSDK/Legacy/LogLevel.swift
diff --git a/Sources/ElixxirDAppsSDK/LogLevelConfigurator.swift b/Sources/ElixxirDAppsSDK/Legacy/LogLevelConfigurator.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/LogLevelConfigurator.swift
rename to Sources/ElixxirDAppsSDK/Legacy/LogLevelConfigurator.swift
diff --git a/Sources/ElixxirDAppsSDK/LogsListener.swift b/Sources/ElixxirDAppsSDK/Legacy/LogsListener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/LogsListener.swift
rename to Sources/ElixxirDAppsSDK/Legacy/LogsListener.swift
diff --git a/Sources/ElixxirDAppsSDK/Message.swift b/Sources/ElixxirDAppsSDK/Legacy/Message.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Message.swift
rename to Sources/ElixxirDAppsSDK/Legacy/Message.swift
diff --git a/Sources/ElixxirDAppsSDK/MessageDeliveryWaiter.swift b/Sources/ElixxirDAppsSDK/Legacy/MessageDeliveryWaiter.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/MessageDeliveryWaiter.swift
rename to Sources/ElixxirDAppsSDK/Legacy/MessageDeliveryWaiter.swift
diff --git a/Sources/ElixxirDAppsSDK/MessageListener.swift b/Sources/ElixxirDAppsSDK/Legacy/MessageListener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/MessageListener.swift
rename to Sources/ElixxirDAppsSDK/Legacy/MessageListener.swift
diff --git a/Sources/ElixxirDAppsSDK/MessageSendReport.swift b/Sources/ElixxirDAppsSDK/Legacy/MessageSendReport.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/MessageSendReport.swift
rename to Sources/ElixxirDAppsSDK/Legacy/MessageSendReport.swift
diff --git a/Sources/ElixxirDAppsSDK/MessageSender.swift b/Sources/ElixxirDAppsSDK/Legacy/MessageSender.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/MessageSender.swift
rename to Sources/ElixxirDAppsSDK/Legacy/MessageSender.swift
diff --git a/Sources/ElixxirDAppsSDK/NDFDownloader.swift b/Sources/ElixxirDAppsSDK/Legacy/NDFDownloader.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NDFDownloader.swift
rename to Sources/ElixxirDAppsSDK/Legacy/NDFDownloader.swift
diff --git a/Sources/ElixxirDAppsSDK/NetworkFollower.swift b/Sources/ElixxirDAppsSDK/Legacy/NetworkFollower.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NetworkFollower.swift
rename to Sources/ElixxirDAppsSDK/Legacy/NetworkFollower.swift
diff --git a/Sources/ElixxirDAppsSDK/NetworkFollowerStarter.swift b/Sources/ElixxirDAppsSDK/Legacy/NetworkFollowerStarter.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NetworkFollowerStarter.swift
rename to Sources/ElixxirDAppsSDK/Legacy/NetworkFollowerStarter.swift
diff --git a/Sources/ElixxirDAppsSDK/NetworkFollowerStatus.swift b/Sources/ElixxirDAppsSDK/Legacy/NetworkFollowerStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NetworkFollowerStatus.swift
rename to Sources/ElixxirDAppsSDK/Legacy/NetworkFollowerStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/NetworkFollowerStatusProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/NetworkFollowerStatusProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NetworkFollowerStatusProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/NetworkFollowerStatusProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/NetworkFollowerStopper.swift b/Sources/ElixxirDAppsSDK/Legacy/NetworkFollowerStopper.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NetworkFollowerStopper.swift
rename to Sources/ElixxirDAppsSDK/Legacy/NetworkFollowerStopper.swift
diff --git a/Sources/ElixxirDAppsSDK/NetworkHealthListener.swift b/Sources/ElixxirDAppsSDK/Legacy/NetworkHealthListener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NetworkHealthListener.swift
rename to Sources/ElixxirDAppsSDK/Legacy/NetworkHealthListener.swift
diff --git a/Sources/ElixxirDAppsSDK/NetworkHealthProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/NetworkHealthProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NetworkHealthProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/NetworkHealthProvider.swift
diff --git a/Sources/ElixxirDAppsSDK/NetworkWaiter.swift b/Sources/ElixxirDAppsSDK/Legacy/NetworkWaiter.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NetworkWaiter.swift
rename to Sources/ElixxirDAppsSDK/Legacy/NetworkWaiter.swift
diff --git a/Sources/ElixxirDAppsSDK/PasswordGenerator.swift b/Sources/ElixxirDAppsSDK/Legacy/PasswordGenerator.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/PasswordGenerator.swift
rename to Sources/ElixxirDAppsSDK/Legacy/PasswordGenerator.swift
diff --git a/Sources/ElixxirDAppsSDK/PasswordStorage.swift b/Sources/ElixxirDAppsSDK/Legacy/PasswordStorage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/PasswordStorage.swift
rename to Sources/ElixxirDAppsSDK/Legacy/PasswordStorage.swift
diff --git a/Sources/ElixxirDAppsSDK/RestlikeMessage.swift b/Sources/ElixxirDAppsSDK/Legacy/RestlikeMessage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/RestlikeMessage.swift
rename to Sources/ElixxirDAppsSDK/Legacy/RestlikeMessage.swift
diff --git a/Sources/ElixxirDAppsSDK/RestlikeRequestSender.swift b/Sources/ElixxirDAppsSDK/Legacy/RestlikeRequestSender.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/RestlikeRequestSender.swift
rename to Sources/ElixxirDAppsSDK/Legacy/RestlikeRequestSender.swift
diff --git a/Sources/ElixxirDAppsSDK/VersionProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/VersionProvider.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/VersionProvider.swift
rename to Sources/ElixxirDAppsSDK/Legacy/VersionProvider.swift