diff --git a/Sources/ElixxirDAppsSDK/Cmix.swift b/Sources/ElixxirDAppsSDK/Cmix/Cmix.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Cmix.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Cmix.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixAddHealthCallback.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixAddHealthCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixAddHealthCallback.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixAddHealthCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixConnect.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixConnect.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixConnect.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixConnect.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixGetId.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixGetId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixGetId.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixGetId.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixHasRunningProcesses.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixHasRunningProcesses.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixHasRunningProcesses.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixHasRunningProcesses.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixIsHealthy.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixIsHealthy.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixIsHealthy.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixIsHealthy.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixMakeLegacyReceptionIdentity.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixMakeLegacyReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixMakeLegacyReceptionIdentity.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixMakeLegacyReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixMakeReceptionIdentity.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixMakeReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixMakeReceptionIdentity.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixMakeReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixNetworkFollowerStatus.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixNetworkFollowerStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixNetworkFollowerStatus.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixNetworkFollowerStatus.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixRegisterClientErrorCallback.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixRegisterClientErrorCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixRegisterClientErrorCallback.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixRegisterClientErrorCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixStartNetworkFollower.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixStartNetworkFollower.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixStartNetworkFollower.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixStartNetworkFollower.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixStopNetworkFollower.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixStopNetworkFollower.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixStopNetworkFollower.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixStopNetworkFollower.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixWaitForMessageDelivery.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixWaitForMessageDelivery.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixWaitForMessageDelivery.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixWaitForMessageDelivery.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixWaitForNetwork.swift b/Sources/ElixxirDAppsSDK/Cmix/Functors/CmixWaitForNetwork.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixWaitForNetwork.swift
rename to Sources/ElixxirDAppsSDK/Cmix/Functors/CmixWaitForNetwork.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManager.swift b/Sources/ElixxirDAppsSDK/CmixManager/CmixManager.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManager.swift
rename to Sources/ElixxirDAppsSDK/CmixManager/CmixManager.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManagerCreate.swift b/Sources/ElixxirDAppsSDK/CmixManager/Functors/CmixManagerCreate.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManagerCreate.swift
rename to Sources/ElixxirDAppsSDK/CmixManager/Functors/CmixManagerCreate.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManagerHasStorage.swift b/Sources/ElixxirDAppsSDK/CmixManager/Functors/CmixManagerHasStorage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManagerHasStorage.swift
rename to Sources/ElixxirDAppsSDK/CmixManager/Functors/CmixManagerHasStorage.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManagerLoad.swift b/Sources/ElixxirDAppsSDK/CmixManager/Functors/CmixManagerLoad.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManagerLoad.swift
rename to Sources/ElixxirDAppsSDK/CmixManager/Functors/CmixManagerLoad.swift
diff --git a/Sources/ElixxirDAppsSDK/CmixManagerRemove.swift b/Sources/ElixxirDAppsSDK/CmixManager/Functors/CmixManagerRemove.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/CmixManagerRemove.swift
rename to Sources/ElixxirDAppsSDK/CmixManager/Functors/CmixManagerRemove.swift
diff --git a/Sources/ElixxirDAppsSDK/Connection.swift b/Sources/ElixxirDAppsSDK/Connection/Connection.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Connection.swift
rename to Sources/ElixxirDAppsSDK/Connection/Connection.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionClose.swift b/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionClose.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionClose.swift
rename to Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionClose.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionGetId.swift b/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionGetId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionGetId.swift
rename to Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionGetId.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionGetPartner.swift b/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionGetPartner.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionGetPartner.swift
rename to Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionGetPartner.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionIsAuthenticated.swift b/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionIsAuthenticated.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionIsAuthenticated.swift
rename to Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionIsAuthenticated.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionRegisterListener.swift b/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionRegisterListener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionRegisterListener.swift
rename to Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionRegisterListener.swift
diff --git a/Sources/ElixxirDAppsSDK/ConnectionSend.swift b/Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionSend.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ConnectionSend.swift
rename to Sources/ElixxirDAppsSDK/Connection/Functors/ConnectionSend.swift
diff --git a/Sources/ElixxirDAppsSDK/E2E.swift b/Sources/ElixxirDAppsSDK/E2E/E2E.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2E.swift
rename to Sources/ElixxirDAppsSDK/E2E/E2E.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EAddPartnerCallback.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EAddPartnerCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EAddPartnerCallback.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EAddPartnerCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EAddService.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EAddService.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EAddService.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EAddService.swift
diff --git a/Sources/ElixxirDAppsSDK/E2ECallAllReceivedRequests.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2ECallAllReceivedRequests.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2ECallAllReceivedRequests.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2ECallAllReceivedRequests.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EConfirmReceivedRequest.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EConfirmReceivedRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EConfirmReceivedRequest.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EConfirmReceivedRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EDeleteRequest.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EDeleteRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EDeleteRequest.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EDeleteRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EGetAllPartnerIds.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetAllPartnerIds.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EGetAllPartnerIds.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetAllPartnerIds.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EGetContact.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EGetContact.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetContact.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EGetHistoricalDHPrivateKey.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetHistoricalDHPrivateKey.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EGetHistoricalDHPrivateKey.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetHistoricalDHPrivateKey.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EGetHistoricalDHPublicKey.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetHistoricalDHPublicKey.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EGetHistoricalDHPublicKey.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetHistoricalDHPublicKey.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EGetId.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EGetId.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetId.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EGetReceivedRequest.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetReceivedRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EGetReceivedRequest.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetReceivedRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EGetReceptionId.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetReceptionId.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EGetReceptionId.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetReceptionId.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EHasAuthenticatedChannel.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EHasAuthenticatedChannel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EHasAuthenticatedChannel.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EHasAuthenticatedChannel.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EPartitionSize.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EPartitionSize.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EPartitionSize.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EPartitionSize.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EPayloadSize.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EPayloadSize.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EPayloadSize.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EPayloadSize.swift
diff --git a/Sources/ElixxirDAppsSDK/E2ERemoveService.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2ERemoveService.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2ERemoveService.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2ERemoveService.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EReplayConfirmReceivedRequest.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EReplayConfirmReceivedRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EReplayConfirmReceivedRequest.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EReplayConfirmReceivedRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/E2ERequestAuthenticatedChannel.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2ERequestAuthenticatedChannel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2ERequestAuthenticatedChannel.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2ERequestAuthenticatedChannel.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EResetAuthenticatedChannel.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EResetAuthenticatedChannel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EResetAuthenticatedChannel.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EResetAuthenticatedChannel.swift
diff --git a/Sources/ElixxirDAppsSDK/E2ESend.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2ESend.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2ESend.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2ESend.swift
diff --git a/Sources/ElixxirDAppsSDK/E2EVerifyOwnership.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EVerifyOwnership.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/E2EVerifyOwnership.swift
rename to Sources/ElixxirDAppsSDK/E2E/Functors/E2EVerifyOwnership.swift
diff --git a/Sources/ElixxirDAppsSDK/AsyncRequestRestlike.swift b/Sources/ElixxirDAppsSDK/Functors/AsyncRequestRestlike.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/AsyncRequestRestlike.swift
rename to Sources/ElixxirDAppsSDK/Functors/AsyncRequestRestlike.swift
diff --git a/Sources/ElixxirDAppsSDK/DownloadAndVerifySignedNdf.swift b/Sources/ElixxirDAppsSDK/Functors/DownloadAndVerifySignedNdf.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/DownloadAndVerifySignedNdf.swift
rename to Sources/ElixxirDAppsSDK/Functors/DownloadAndVerifySignedNdf.swift
diff --git a/Sources/ElixxirDAppsSDK/EnableGrpcLogs.swift b/Sources/ElixxirDAppsSDK/Functors/EnableGrpcLogs.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/EnableGrpcLogs.swift
rename to Sources/ElixxirDAppsSDK/Functors/EnableGrpcLogs.swift
diff --git a/Sources/ElixxirDAppsSDK/GenerateSecret.swift b/Sources/ElixxirDAppsSDK/Functors/GenerateSecret.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GenerateSecret.swift
rename to Sources/ElixxirDAppsSDK/Functors/GenerateSecret.swift
diff --git a/Sources/ElixxirDAppsSDK/GetCmixParams.swift b/Sources/ElixxirDAppsSDK/Functors/GetCmixParams.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetCmixParams.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetCmixParams.swift
diff --git a/Sources/ElixxirDAppsSDK/GetDependencies.swift b/Sources/ElixxirDAppsSDK/Functors/GetDependencies.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetDependencies.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetDependencies.swift
diff --git a/Sources/ElixxirDAppsSDK/GetE2EParams.swift b/Sources/ElixxirDAppsSDK/Functors/GetE2EParams.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetE2EParams.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetE2EParams.swift
diff --git a/Sources/ElixxirDAppsSDK/GetFactsFromContact.swift b/Sources/ElixxirDAppsSDK/Functors/GetFactsFromContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetFactsFromContact.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetFactsFromContact.swift
diff --git a/Sources/ElixxirDAppsSDK/GetFileTransferParams.swift b/Sources/ElixxirDAppsSDK/Functors/GetFileTransferParams.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetFileTransferParams.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetFileTransferParams.swift
diff --git a/Sources/ElixxirDAppsSDK/GetGitVersion.swift b/Sources/ElixxirDAppsSDK/Functors/GetGitVersion.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetGitVersion.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetGitVersion.swift
diff --git a/Sources/ElixxirDAppsSDK/GetIdFromContact.swift b/Sources/ElixxirDAppsSDK/Functors/GetIdFromContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetIdFromContact.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetIdFromContact.swift
diff --git a/Sources/ElixxirDAppsSDK/GetPublicKeyFromContact.swift b/Sources/ElixxirDAppsSDK/Functors/GetPublicKeyFromContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetPublicKeyFromContact.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetPublicKeyFromContact.swift
diff --git a/Sources/ElixxirDAppsSDK/GetSingleUseParams.swift b/Sources/ElixxirDAppsSDK/Functors/GetSingleUseParams.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetSingleUseParams.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetSingleUseParams.swift
diff --git a/Sources/ElixxirDAppsSDK/GetVersion.swift b/Sources/ElixxirDAppsSDK/Functors/GetVersion.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/GetVersion.swift
rename to Sources/ElixxirDAppsSDK/Functors/GetVersion.swift
diff --git a/Sources/ElixxirDAppsSDK/LoadCmix.swift b/Sources/ElixxirDAppsSDK/Functors/LoadCmix.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/LoadCmix.swift
rename to Sources/ElixxirDAppsSDK/Functors/LoadCmix.swift
diff --git a/Sources/ElixxirDAppsSDK/LoadReceptionIdentity.swift b/Sources/ElixxirDAppsSDK/Functors/LoadReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/LoadReceptionIdentity.swift
rename to Sources/ElixxirDAppsSDK/Functors/LoadReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/Login.swift b/Sources/ElixxirDAppsSDK/Functors/Login.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Login.swift
rename to Sources/ElixxirDAppsSDK/Functors/Login.swift
diff --git a/Sources/ElixxirDAppsSDK/NewCmix.swift b/Sources/ElixxirDAppsSDK/Functors/NewCmix.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NewCmix.swift
rename to Sources/ElixxirDAppsSDK/Functors/NewCmix.swift
diff --git a/Sources/ElixxirDAppsSDK/RegisterLogWriter.swift b/Sources/ElixxirDAppsSDK/Functors/RegisterLogWriter.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/RegisterLogWriter.swift
rename to Sources/ElixxirDAppsSDK/Functors/RegisterLogWriter.swift
diff --git a/Sources/ElixxirDAppsSDK/RequestRestlike.swift b/Sources/ElixxirDAppsSDK/Functors/RequestRestlike.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/RequestRestlike.swift
rename to Sources/ElixxirDAppsSDK/Functors/RequestRestlike.swift
diff --git a/Sources/ElixxirDAppsSDK/RestlikeRequest.swift b/Sources/ElixxirDAppsSDK/Functors/RestlikeRequest.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/RestlikeRequest.swift
rename to Sources/ElixxirDAppsSDK/Functors/RestlikeRequest.swift
diff --git a/Sources/ElixxirDAppsSDK/SetFactsOnContact.swift b/Sources/ElixxirDAppsSDK/Functors/SetFactsOnContact.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/SetFactsOnContact.swift
rename to Sources/ElixxirDAppsSDK/Functors/SetFactsOnContact.swift
diff --git a/Sources/ElixxirDAppsSDK/SetLogLevel.swift b/Sources/ElixxirDAppsSDK/Functors/SetLogLevel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/SetLogLevel.swift
rename to Sources/ElixxirDAppsSDK/Functors/SetLogLevel.swift
diff --git a/Sources/ElixxirDAppsSDK/StoreReceptionIdentity.swift b/Sources/ElixxirDAppsSDK/Functors/StoreReceptionIdentity.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/StoreReceptionIdentity.swift
rename to Sources/ElixxirDAppsSDK/Functors/StoreReceptionIdentity.swift
diff --git a/Sources/ElixxirDAppsSDK/Cancellable.swift b/Sources/ElixxirDAppsSDK/Helpers/Cancellable.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Cancellable.swift
rename to Sources/ElixxirDAppsSDK/Helpers/Cancellable.swift
diff --git a/Sources/ElixxirDAppsSDK/PasswordStorage.swift b/Sources/ElixxirDAppsSDK/Helpers/PasswordStorage.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/PasswordStorage.swift
rename to Sources/ElixxirDAppsSDK/Helpers/PasswordStorage.swift