diff --git a/Sources/XXClient/Backup/Functors/BackupAddJson.swift b/Sources/XXClient/Backup/Functions/BackupAddJson.swift
similarity index 100%
rename from Sources/XXClient/Backup/Functors/BackupAddJson.swift
rename to Sources/XXClient/Backup/Functions/BackupAddJson.swift
diff --git a/Sources/XXClient/Backup/Functors/BackupIsRunning.swift b/Sources/XXClient/Backup/Functions/BackupIsRunning.swift
similarity index 100%
rename from Sources/XXClient/Backup/Functors/BackupIsRunning.swift
rename to Sources/XXClient/Backup/Functions/BackupIsRunning.swift
diff --git a/Sources/XXClient/Backup/Functors/BackupStop.swift b/Sources/XXClient/Backup/Functions/BackupStop.swift
similarity index 100%
rename from Sources/XXClient/Backup/Functors/BackupStop.swift
rename to Sources/XXClient/Backup/Functions/BackupStop.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixAddHealthCallback.swift b/Sources/XXClient/CMix/Functions/CMixAddHealthCallback.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixAddHealthCallback.swift
rename to Sources/XXClient/CMix/Functions/CMixAddHealthCallback.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixConnect.swift b/Sources/XXClient/CMix/Functions/CMixConnect.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixConnect.swift
rename to Sources/XXClient/CMix/Functions/CMixConnect.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixGetId.swift b/Sources/XXClient/CMix/Functions/CMixGetId.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixGetId.swift
rename to Sources/XXClient/CMix/Functions/CMixGetId.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixGetNodeRegistrationStatus.swift b/Sources/XXClient/CMix/Functions/CMixGetNodeRegistrationStatus.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixGetNodeRegistrationStatus.swift
rename to Sources/XXClient/CMix/Functions/CMixGetNodeRegistrationStatus.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixGetReceptionRegistrationValidationSignature.swift b/Sources/XXClient/CMix/Functions/CMixGetReceptionRegistrationValidationSignature.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixGetReceptionRegistrationValidationSignature.swift
rename to Sources/XXClient/CMix/Functions/CMixGetReceptionRegistrationValidationSignature.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixHasRunningProcesses.swift b/Sources/XXClient/CMix/Functions/CMixHasRunningProcesses.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixHasRunningProcesses.swift
rename to Sources/XXClient/CMix/Functions/CMixHasRunningProcesses.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixIsHealthy.swift b/Sources/XXClient/CMix/Functions/CMixIsHealthy.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixIsHealthy.swift
rename to Sources/XXClient/CMix/Functions/CMixIsHealthy.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixMakeReceptionIdentity.swift b/Sources/XXClient/CMix/Functions/CMixMakeReceptionIdentity.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixMakeReceptionIdentity.swift
rename to Sources/XXClient/CMix/Functions/CMixMakeReceptionIdentity.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixNetworkFollowerStatus.swift b/Sources/XXClient/CMix/Functions/CMixNetworkFollowerStatus.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixNetworkFollowerStatus.swift
rename to Sources/XXClient/CMix/Functions/CMixNetworkFollowerStatus.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixRegisterClientErrorCallback.swift b/Sources/XXClient/CMix/Functions/CMixRegisterClientErrorCallback.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixRegisterClientErrorCallback.swift
rename to Sources/XXClient/CMix/Functions/CMixRegisterClientErrorCallback.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixStartNetworkFollower.swift b/Sources/XXClient/CMix/Functions/CMixStartNetworkFollower.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixStartNetworkFollower.swift
rename to Sources/XXClient/CMix/Functions/CMixStartNetworkFollower.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixStopNetworkFollower.swift b/Sources/XXClient/CMix/Functions/CMixStopNetworkFollower.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixStopNetworkFollower.swift
rename to Sources/XXClient/CMix/Functions/CMixStopNetworkFollower.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixTrackServices.swift b/Sources/XXClient/CMix/Functions/CMixTrackServices.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixTrackServices.swift
rename to Sources/XXClient/CMix/Functions/CMixTrackServices.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixWaitForNetwork.swift b/Sources/XXClient/CMix/Functions/CMixWaitForNetwork.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixWaitForNetwork.swift
rename to Sources/XXClient/CMix/Functions/CMixWaitForNetwork.swift
diff --git a/Sources/XXClient/CMix/Functors/CMixWaitForRoundResult.swift b/Sources/XXClient/CMix/Functions/CMixWaitForRoundResult.swift
similarity index 100%
rename from Sources/XXClient/CMix/Functors/CMixWaitForRoundResult.swift
rename to Sources/XXClient/CMix/Functions/CMixWaitForRoundResult.swift
diff --git a/Sources/XXClient/CMixManager/Functors/CMixManagerCreate.swift b/Sources/XXClient/CMixManager/Functions/CMixManagerCreate.swift
similarity index 100%
rename from Sources/XXClient/CMixManager/Functors/CMixManagerCreate.swift
rename to Sources/XXClient/CMixManager/Functions/CMixManagerCreate.swift
diff --git a/Sources/XXClient/CMixManager/Functors/CMixManagerHasStorage.swift b/Sources/XXClient/CMixManager/Functions/CMixManagerHasStorage.swift
similarity index 100%
rename from Sources/XXClient/CMixManager/Functors/CMixManagerHasStorage.swift
rename to Sources/XXClient/CMixManager/Functions/CMixManagerHasStorage.swift
diff --git a/Sources/XXClient/CMixManager/Functors/CMixManagerLoad.swift b/Sources/XXClient/CMixManager/Functions/CMixManagerLoad.swift
similarity index 100%
rename from Sources/XXClient/CMixManager/Functors/CMixManagerLoad.swift
rename to Sources/XXClient/CMixManager/Functions/CMixManagerLoad.swift
diff --git a/Sources/XXClient/CMixManager/Functors/CMixManagerRemove.swift b/Sources/XXClient/CMixManager/Functions/CMixManagerRemove.swift
similarity index 100%
rename from Sources/XXClient/CMixManager/Functors/CMixManagerRemove.swift
rename to Sources/XXClient/CMixManager/Functions/CMixManagerRemove.swift
diff --git a/Sources/XXClient/CMixManager/Functors/CMixManagerRestore.swift b/Sources/XXClient/CMixManager/Functions/CMixManagerRestore.swift
similarity index 100%
rename from Sources/XXClient/CMixManager/Functors/CMixManagerRestore.swift
rename to Sources/XXClient/CMixManager/Functions/CMixManagerRestore.swift
diff --git a/Sources/XXClient/Channel/Functors/ChannelBroadcast.swift b/Sources/XXClient/Channel/Functions/ChannelBroadcast.swift
similarity index 100%
rename from Sources/XXClient/Channel/Functors/ChannelBroadcast.swift
rename to Sources/XXClient/Channel/Functions/ChannelBroadcast.swift
diff --git a/Sources/XXClient/Channel/Functors/ChannelBroadcastAsymmetric.swift b/Sources/XXClient/Channel/Functions/ChannelBroadcastAsymmetric.swift
similarity index 100%
rename from Sources/XXClient/Channel/Functors/ChannelBroadcastAsymmetric.swift
rename to Sources/XXClient/Channel/Functions/ChannelBroadcastAsymmetric.swift
diff --git a/Sources/XXClient/Channel/Functors/ChannelGet.swift b/Sources/XXClient/Channel/Functions/ChannelGet.swift
similarity index 100%
rename from Sources/XXClient/Channel/Functors/ChannelGet.swift
rename to Sources/XXClient/Channel/Functions/ChannelGet.swift
diff --git a/Sources/XXClient/Channel/Functors/ChannelListen.swift b/Sources/XXClient/Channel/Functions/ChannelListen.swift
similarity index 100%
rename from Sources/XXClient/Channel/Functors/ChannelListen.swift
rename to Sources/XXClient/Channel/Functions/ChannelListen.swift
diff --git a/Sources/XXClient/Channel/Functors/ChannelMaxAsymmetricPayloadSize.swift b/Sources/XXClient/Channel/Functions/ChannelMaxAsymmetricPayloadSize.swift
similarity index 100%
rename from Sources/XXClient/Channel/Functors/ChannelMaxAsymmetricPayloadSize.swift
rename to Sources/XXClient/Channel/Functions/ChannelMaxAsymmetricPayloadSize.swift
diff --git a/Sources/XXClient/Channel/Functors/ChannelMaxPayloadSize.swift b/Sources/XXClient/Channel/Functions/ChannelMaxPayloadSize.swift
similarity index 100%
rename from Sources/XXClient/Channel/Functors/ChannelMaxPayloadSize.swift
rename to Sources/XXClient/Channel/Functions/ChannelMaxPayloadSize.swift
diff --git a/Sources/XXClient/Channel/Functors/ChannelStop.swift b/Sources/XXClient/Channel/Functions/ChannelStop.swift
similarity index 100%
rename from Sources/XXClient/Channel/Functors/ChannelStop.swift
rename to Sources/XXClient/Channel/Functions/ChannelStop.swift
diff --git a/Sources/XXClient/Connection/Functors/ConnectionClose.swift b/Sources/XXClient/Connection/Functions/ConnectionClose.swift
similarity index 100%
rename from Sources/XXClient/Connection/Functors/ConnectionClose.swift
rename to Sources/XXClient/Connection/Functions/ConnectionClose.swift
diff --git a/Sources/XXClient/Connection/Functors/ConnectionGetId.swift b/Sources/XXClient/Connection/Functions/ConnectionGetId.swift
similarity index 100%
rename from Sources/XXClient/Connection/Functors/ConnectionGetId.swift
rename to Sources/XXClient/Connection/Functions/ConnectionGetId.swift
diff --git a/Sources/XXClient/Connection/Functors/ConnectionGetPartner.swift b/Sources/XXClient/Connection/Functions/ConnectionGetPartner.swift
similarity index 100%
rename from Sources/XXClient/Connection/Functors/ConnectionGetPartner.swift
rename to Sources/XXClient/Connection/Functions/ConnectionGetPartner.swift
diff --git a/Sources/XXClient/Connection/Functors/ConnectionIsAuthenticated.swift b/Sources/XXClient/Connection/Functions/ConnectionIsAuthenticated.swift
similarity index 100%
rename from Sources/XXClient/Connection/Functors/ConnectionIsAuthenticated.swift
rename to Sources/XXClient/Connection/Functions/ConnectionIsAuthenticated.swift
diff --git a/Sources/XXClient/Connection/Functors/ConnectionRegisterListener.swift b/Sources/XXClient/Connection/Functions/ConnectionRegisterListener.swift
similarity index 100%
rename from Sources/XXClient/Connection/Functors/ConnectionRegisterListener.swift
rename to Sources/XXClient/Connection/Functions/ConnectionRegisterListener.swift
diff --git a/Sources/XXClient/Connection/Functors/ConnectionSend.swift b/Sources/XXClient/Connection/Functions/ConnectionSend.swift
similarity index 100%
rename from Sources/XXClient/Connection/Functors/ConnectionSend.swift
rename to Sources/XXClient/Connection/Functions/ConnectionSend.swift
diff --git a/Sources/XXClient/DummyTraffic/Functors/DummyTrafficGetStatus.swift b/Sources/XXClient/DummyTraffic/Functions/DummyTrafficGetStatus.swift
similarity index 100%
rename from Sources/XXClient/DummyTraffic/Functors/DummyTrafficGetStatus.swift
rename to Sources/XXClient/DummyTraffic/Functions/DummyTrafficGetStatus.swift
diff --git a/Sources/XXClient/DummyTraffic/Functors/DummyTrafficSetStatus.swift b/Sources/XXClient/DummyTraffic/Functions/DummyTrafficSetStatus.swift
similarity index 100%
rename from Sources/XXClient/DummyTraffic/Functors/DummyTrafficSetStatus.swift
rename to Sources/XXClient/DummyTraffic/Functions/DummyTrafficSetStatus.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EAddPartnerCallback.swift b/Sources/XXClient/E2E/Functions/E2EAddPartnerCallback.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EAddPartnerCallback.swift
rename to Sources/XXClient/E2E/Functions/E2EAddPartnerCallback.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EAddService.swift b/Sources/XXClient/E2E/Functions/E2EAddService.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EAddService.swift
rename to Sources/XXClient/E2E/Functions/E2EAddService.swift
diff --git a/Sources/XXClient/E2E/Functors/E2ECallAllReceivedRequests.swift b/Sources/XXClient/E2E/Functions/E2ECallAllReceivedRequests.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2ECallAllReceivedRequests.swift
rename to Sources/XXClient/E2E/Functions/E2ECallAllReceivedRequests.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EConfirmReceivedRequest.swift b/Sources/XXClient/E2E/Functions/E2EConfirmReceivedRequest.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EConfirmReceivedRequest.swift
rename to Sources/XXClient/E2E/Functions/E2EConfirmReceivedRequest.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EDeleteRequest.swift b/Sources/XXClient/E2E/Functions/E2EDeleteRequest.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EDeleteRequest.swift
rename to Sources/XXClient/E2E/Functions/E2EDeleteRequest.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetAllPartnerIds.swift b/Sources/XXClient/E2E/Functions/E2EGetAllPartnerIds.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetAllPartnerIds.swift
rename to Sources/XXClient/E2E/Functions/E2EGetAllPartnerIds.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetContact.swift b/Sources/XXClient/E2E/Functions/E2EGetContact.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetContact.swift
rename to Sources/XXClient/E2E/Functions/E2EGetContact.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetHistoricalDHPrivateKey.swift b/Sources/XXClient/E2E/Functions/E2EGetHistoricalDHPrivateKey.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetHistoricalDHPrivateKey.swift
rename to Sources/XXClient/E2E/Functions/E2EGetHistoricalDHPrivateKey.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetHistoricalDHPublicKey.swift b/Sources/XXClient/E2E/Functions/E2EGetHistoricalDHPublicKey.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetHistoricalDHPublicKey.swift
rename to Sources/XXClient/E2E/Functions/E2EGetHistoricalDHPublicKey.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetId.swift b/Sources/XXClient/E2E/Functions/E2EGetId.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetId.swift
rename to Sources/XXClient/E2E/Functions/E2EGetId.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetReceivedRequest.swift b/Sources/XXClient/E2E/Functions/E2EGetReceivedRequest.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetReceivedRequest.swift
rename to Sources/XXClient/E2E/Functions/E2EGetReceivedRequest.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetReceptionId.swift b/Sources/XXClient/E2E/Functions/E2EGetReceptionId.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetReceptionId.swift
rename to Sources/XXClient/E2E/Functions/E2EGetReceptionId.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetUdAddressFromNdf.swift b/Sources/XXClient/E2E/Functions/E2EGetUdAddressFromNdf.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetUdAddressFromNdf.swift
rename to Sources/XXClient/E2E/Functions/E2EGetUdAddressFromNdf.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetUdCertFromNdf.swift b/Sources/XXClient/E2E/Functions/E2EGetUdCertFromNdf.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetUdCertFromNdf.swift
rename to Sources/XXClient/E2E/Functions/E2EGetUdCertFromNdf.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EGetUdContactFromNdf.swift b/Sources/XXClient/E2E/Functions/E2EGetUdContactFromNdf.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EGetUdContactFromNdf.swift
rename to Sources/XXClient/E2E/Functions/E2EGetUdContactFromNdf.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EHasAuthenticatedChannel.swift b/Sources/XXClient/E2E/Functions/E2EHasAuthenticatedChannel.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EHasAuthenticatedChannel.swift
rename to Sources/XXClient/E2E/Functions/E2EHasAuthenticatedChannel.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EPartitionSize.swift b/Sources/XXClient/E2E/Functions/E2EPartitionSize.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EPartitionSize.swift
rename to Sources/XXClient/E2E/Functions/E2EPartitionSize.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EPayloadSize.swift b/Sources/XXClient/E2E/Functions/E2EPayloadSize.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EPayloadSize.swift
rename to Sources/XXClient/E2E/Functions/E2EPayloadSize.swift
diff --git a/Sources/XXClient/E2E/Functors/E2ERegisterListener.swift b/Sources/XXClient/E2E/Functions/E2ERegisterListener.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2ERegisterListener.swift
rename to Sources/XXClient/E2E/Functions/E2ERegisterListener.swift
diff --git a/Sources/XXClient/E2E/Functors/E2ERemoveService.swift b/Sources/XXClient/E2E/Functions/E2ERemoveService.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2ERemoveService.swift
rename to Sources/XXClient/E2E/Functions/E2ERemoveService.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EReplayConfirmReceivedRequest.swift b/Sources/XXClient/E2E/Functions/E2EReplayConfirmReceivedRequest.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EReplayConfirmReceivedRequest.swift
rename to Sources/XXClient/E2E/Functions/E2EReplayConfirmReceivedRequest.swift
diff --git a/Sources/XXClient/E2E/Functors/E2ERequestAuthenticatedChannel.swift b/Sources/XXClient/E2E/Functions/E2ERequestAuthenticatedChannel.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2ERequestAuthenticatedChannel.swift
rename to Sources/XXClient/E2E/Functions/E2ERequestAuthenticatedChannel.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EResetAuthenticatedChannel.swift b/Sources/XXClient/E2E/Functions/E2EResetAuthenticatedChannel.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EResetAuthenticatedChannel.swift
rename to Sources/XXClient/E2E/Functions/E2EResetAuthenticatedChannel.swift
diff --git a/Sources/XXClient/E2E/Functors/E2ESend.swift b/Sources/XXClient/E2E/Functions/E2ESend.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2ESend.swift
rename to Sources/XXClient/E2E/Functions/E2ESend.swift
diff --git a/Sources/XXClient/E2E/Functors/E2EVerifyOwnership.swift b/Sources/XXClient/E2E/Functions/E2EVerifyOwnership.swift
similarity index 100%
rename from Sources/XXClient/E2E/Functors/E2EVerifyOwnership.swift
rename to Sources/XXClient/E2E/Functions/E2EVerifyOwnership.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FilePartTrackerGetNumParts.swift b/Sources/XXClient/FileTransfer/Functions/FilePartTrackerGetNumParts.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FilePartTrackerGetNumParts.swift
rename to Sources/XXClient/FileTransfer/Functions/FilePartTrackerGetNumParts.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FilePartTrackerGetPartStatus.swift b/Sources/XXClient/FileTransfer/Functions/FilePartTrackerGetPartStatus.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FilePartTrackerGetPartStatus.swift
rename to Sources/XXClient/FileTransfer/Functions/FilePartTrackerGetPartStatus.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FileTransferCloseSend.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferCloseSend.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FileTransferCloseSend.swift
rename to Sources/XXClient/FileTransfer/Functions/FileTransferCloseSend.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FileTransferMaxFileSize.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferMaxFileSize.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FileTransferMaxFileSize.swift
rename to Sources/XXClient/FileTransfer/Functions/FileTransferMaxFileSize.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FileTransferMaxFileTypeLen.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferMaxFileTypeLen.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FileTransferMaxFileTypeLen.swift
rename to Sources/XXClient/FileTransfer/Functions/FileTransferMaxFileTypeLen.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FileTransferMaxFilenameLen.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferMaxFilenameLen.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FileTransferMaxFilenameLen.swift
rename to Sources/XXClient/FileTransfer/Functions/FileTransferMaxFilenameLen.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FileTransferMaxPreviewSize.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferMaxPreviewSize.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FileTransferMaxPreviewSize.swift
rename to Sources/XXClient/FileTransfer/Functions/FileTransferMaxPreviewSize.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FileTransferReceive.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferReceive.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FileTransferReceive.swift
rename to Sources/XXClient/FileTransfer/Functions/FileTransferReceive.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FileTransferRegisterReceivedProgressCallback.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferRegisterReceivedProgressCallback.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FileTransferRegisterReceivedProgressCallback.swift
rename to Sources/XXClient/FileTransfer/Functions/FileTransferRegisterReceivedProgressCallback.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FileTransferRegisterSentProgressCallback.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferRegisterSentProgressCallback.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FileTransferRegisterSentProgressCallback.swift
rename to Sources/XXClient/FileTransfer/Functions/FileTransferRegisterSentProgressCallback.swift
diff --git a/Sources/XXClient/FileTransfer/Functors/FileTransferSend.swift b/Sources/XXClient/FileTransfer/Functions/FileTransferSend.swift
similarity index 100%
rename from Sources/XXClient/FileTransfer/Functors/FileTransferSend.swift
rename to Sources/XXClient/FileTransfer/Functions/FileTransferSend.swift
diff --git a/Sources/XXClient/Functors/AsyncRequestRestlike.swift b/Sources/XXClient/Functions/AsyncRequestRestlike.swift
similarity index 100%
rename from Sources/XXClient/Functors/AsyncRequestRestlike.swift
rename to Sources/XXClient/Functions/AsyncRequestRestlike.swift
diff --git a/Sources/XXClient/Functors/CreateUserFriendlyErrorMessage.swift b/Sources/XXClient/Functions/CreateUserFriendlyErrorMessage.swift
similarity index 100%
rename from Sources/XXClient/Functors/CreateUserFriendlyErrorMessage.swift
rename to Sources/XXClient/Functions/CreateUserFriendlyErrorMessage.swift
diff --git a/Sources/XXClient/Functors/DownloadAndVerifySignedNdf.swift b/Sources/XXClient/Functions/DownloadAndVerifySignedNdf.swift
similarity index 100%
rename from Sources/XXClient/Functors/DownloadAndVerifySignedNdf.swift
rename to Sources/XXClient/Functions/DownloadAndVerifySignedNdf.swift
diff --git a/Sources/XXClient/Functors/EnableGrpcLogs.swift b/Sources/XXClient/Functions/EnableGrpcLogs.swift
similarity index 100%
rename from Sources/XXClient/Functors/EnableGrpcLogs.swift
rename to Sources/XXClient/Functions/EnableGrpcLogs.swift
diff --git a/Sources/XXClient/Functors/GenerateSecret.swift b/Sources/XXClient/Functions/GenerateSecret.swift
similarity index 100%
rename from Sources/XXClient/Functors/GenerateSecret.swift
rename to Sources/XXClient/Functions/GenerateSecret.swift
diff --git a/Sources/XXClient/Functors/GetCMixParams.swift b/Sources/XXClient/Functions/GetCMixParams.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetCMixParams.swift
rename to Sources/XXClient/Functions/GetCMixParams.swift
diff --git a/Sources/XXClient/Functors/GetDependencies.swift b/Sources/XXClient/Functions/GetDependencies.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetDependencies.swift
rename to Sources/XXClient/Functions/GetDependencies.swift
diff --git a/Sources/XXClient/Functors/GetE2EFileTransferParams.swift b/Sources/XXClient/Functions/GetE2EFileTransferParams.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetE2EFileTransferParams.swift
rename to Sources/XXClient/Functions/GetE2EFileTransferParams.swift
diff --git a/Sources/XXClient/Functors/GetE2EParams.swift b/Sources/XXClient/Functions/GetE2EParams.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetE2EParams.swift
rename to Sources/XXClient/Functions/GetE2EParams.swift
diff --git a/Sources/XXClient/Functors/GetFactsFromContact.swift b/Sources/XXClient/Functions/GetFactsFromContact.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetFactsFromContact.swift
rename to Sources/XXClient/Functions/GetFactsFromContact.swift
diff --git a/Sources/XXClient/Functors/GetFileTransferParams.swift b/Sources/XXClient/Functions/GetFileTransferParams.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetFileTransferParams.swift
rename to Sources/XXClient/Functions/GetFileTransferParams.swift
diff --git a/Sources/XXClient/Functors/GetGitVersion.swift b/Sources/XXClient/Functions/GetGitVersion.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetGitVersion.swift
rename to Sources/XXClient/Functions/GetGitVersion.swift
diff --git a/Sources/XXClient/Functors/GetIdFromContact.swift b/Sources/XXClient/Functions/GetIdFromContact.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetIdFromContact.swift
rename to Sources/XXClient/Functions/GetIdFromContact.swift
diff --git a/Sources/XXClient/Functors/GetNotificationsReport.swift b/Sources/XXClient/Functions/GetNotificationsReport.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetNotificationsReport.swift
rename to Sources/XXClient/Functions/GetNotificationsReport.swift
diff --git a/Sources/XXClient/Functors/GetPublicKeyFromContact.swift b/Sources/XXClient/Functions/GetPublicKeyFromContact.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetPublicKeyFromContact.swift
rename to Sources/XXClient/Functions/GetPublicKeyFromContact.swift
diff --git a/Sources/XXClient/Functors/GetSingleUseParams.swift b/Sources/XXClient/Functions/GetSingleUseParams.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetSingleUseParams.swift
rename to Sources/XXClient/Functions/GetSingleUseParams.swift
diff --git a/Sources/XXClient/Functors/GetVersion.swift b/Sources/XXClient/Functions/GetVersion.swift
similarity index 100%
rename from Sources/XXClient/Functors/GetVersion.swift
rename to Sources/XXClient/Functions/GetVersion.swift
diff --git a/Sources/XXClient/Functors/InitFileTransfer.swift b/Sources/XXClient/Functions/InitFileTransfer.swift
similarity index 100%
rename from Sources/XXClient/Functors/InitFileTransfer.swift
rename to Sources/XXClient/Functions/InitFileTransfer.swift
diff --git a/Sources/XXClient/Functors/InitializeBackup.swift b/Sources/XXClient/Functions/InitializeBackup.swift
similarity index 100%
rename from Sources/XXClient/Functors/InitializeBackup.swift
rename to Sources/XXClient/Functions/InitializeBackup.swift
diff --git a/Sources/XXClient/Functors/IsRegisteredWithUD.swift b/Sources/XXClient/Functions/IsRegisteredWithUD.swift
similarity index 100%
rename from Sources/XXClient/Functors/IsRegisteredWithUD.swift
rename to Sources/XXClient/Functions/IsRegisteredWithUD.swift
diff --git a/Sources/XXClient/Functors/Listen.swift b/Sources/XXClient/Functions/Listen.swift
similarity index 100%
rename from Sources/XXClient/Functors/Listen.swift
rename to Sources/XXClient/Functions/Listen.swift
diff --git a/Sources/XXClient/Functors/LoadCMix.swift b/Sources/XXClient/Functions/LoadCMix.swift
similarity index 100%
rename from Sources/XXClient/Functors/LoadCMix.swift
rename to Sources/XXClient/Functions/LoadCMix.swift
diff --git a/Sources/XXClient/Functors/LoadReceptionIdentity.swift b/Sources/XXClient/Functions/LoadReceptionIdentity.swift
similarity index 100%
rename from Sources/XXClient/Functors/LoadReceptionIdentity.swift
rename to Sources/XXClient/Functions/LoadReceptionIdentity.swift
diff --git a/Sources/XXClient/Functors/Login.swift b/Sources/XXClient/Functions/Login.swift
similarity index 100%
rename from Sources/XXClient/Functors/Login.swift
rename to Sources/XXClient/Functions/Login.swift
diff --git a/Sources/XXClient/Functors/LookupUD.swift b/Sources/XXClient/Functions/LookupUD.swift
similarity index 100%
rename from Sources/XXClient/Functors/LookupUD.swift
rename to Sources/XXClient/Functions/LookupUD.swift
diff --git a/Sources/XXClient/Functors/NewBroadcastChannel.swift b/Sources/XXClient/Functions/NewBroadcastChannel.swift
similarity index 100%
rename from Sources/XXClient/Functors/NewBroadcastChannel.swift
rename to Sources/XXClient/Functions/NewBroadcastChannel.swift
diff --git a/Sources/XXClient/Functors/NewCMix.swift b/Sources/XXClient/Functions/NewCMix.swift
similarity index 100%
rename from Sources/XXClient/Functors/NewCMix.swift
rename to Sources/XXClient/Functions/NewCMix.swift
diff --git a/Sources/XXClient/Functors/NewCMixFromBackup.swift b/Sources/XXClient/Functions/NewCMixFromBackup.swift
similarity index 100%
rename from Sources/XXClient/Functors/NewCMixFromBackup.swift
rename to Sources/XXClient/Functions/NewCMixFromBackup.swift
diff --git a/Sources/XXClient/Functors/NewDummyTrafficManager.swift b/Sources/XXClient/Functions/NewDummyTrafficManager.swift
similarity index 100%
rename from Sources/XXClient/Functors/NewDummyTrafficManager.swift
rename to Sources/XXClient/Functions/NewDummyTrafficManager.swift
diff --git a/Sources/XXClient/Functors/NewGroupChat.swift b/Sources/XXClient/Functions/NewGroupChat.swift
similarity index 100%
rename from Sources/XXClient/Functors/NewGroupChat.swift
rename to Sources/XXClient/Functions/NewGroupChat.swift
diff --git a/Sources/XXClient/Functors/NewOrLoadUd.swift b/Sources/XXClient/Functions/NewOrLoadUd.swift
similarity index 100%
rename from Sources/XXClient/Functors/NewOrLoadUd.swift
rename to Sources/XXClient/Functions/NewOrLoadUd.swift
diff --git a/Sources/XXClient/Functors/NewUdManagerFromBackup.swift b/Sources/XXClient/Functions/NewUdManagerFromBackup.swift
similarity index 100%
rename from Sources/XXClient/Functors/NewUdManagerFromBackup.swift
rename to Sources/XXClient/Functions/NewUdManagerFromBackup.swift
diff --git a/Sources/XXClient/Functors/RegisterForNotifications.swift b/Sources/XXClient/Functions/RegisterForNotifications.swift
similarity index 100%
rename from Sources/XXClient/Functors/RegisterForNotifications.swift
rename to Sources/XXClient/Functions/RegisterForNotifications.swift
diff --git a/Sources/XXClient/Functors/RegisterLogWriter.swift b/Sources/XXClient/Functions/RegisterLogWriter.swift
similarity index 100%
rename from Sources/XXClient/Functors/RegisterLogWriter.swift
rename to Sources/XXClient/Functions/RegisterLogWriter.swift
diff --git a/Sources/XXClient/Functors/RequestRestlike.swift b/Sources/XXClient/Functions/RequestRestlike.swift
similarity index 100%
rename from Sources/XXClient/Functors/RequestRestlike.swift
rename to Sources/XXClient/Functions/RequestRestlike.swift
diff --git a/Sources/XXClient/Functors/RestlikeRequest.swift b/Sources/XXClient/Functions/RestlikeRequest.swift
similarity index 100%
rename from Sources/XXClient/Functors/RestlikeRequest.swift
rename to Sources/XXClient/Functions/RestlikeRequest.swift
diff --git a/Sources/XXClient/Functors/ResumeBackup.swift b/Sources/XXClient/Functions/ResumeBackup.swift
similarity index 100%
rename from Sources/XXClient/Functors/ResumeBackup.swift
rename to Sources/XXClient/Functions/ResumeBackup.swift
diff --git a/Sources/XXClient/Functors/SearchUD.swift b/Sources/XXClient/Functions/SearchUD.swift
similarity index 100%
rename from Sources/XXClient/Functors/SearchUD.swift
rename to Sources/XXClient/Functions/SearchUD.swift
diff --git a/Sources/XXClient/Functors/SetFactsOnContact.swift b/Sources/XXClient/Functions/SetFactsOnContact.swift
similarity index 100%
rename from Sources/XXClient/Functors/SetFactsOnContact.swift
rename to Sources/XXClient/Functions/SetFactsOnContact.swift
diff --git a/Sources/XXClient/Functors/SetLogLevel.swift b/Sources/XXClient/Functions/SetLogLevel.swift
similarity index 100%
rename from Sources/XXClient/Functors/SetLogLevel.swift
rename to Sources/XXClient/Functions/SetLogLevel.swift
diff --git a/Sources/XXClient/Functors/StoreReceptionIdentity.swift b/Sources/XXClient/Functions/StoreReceptionIdentity.swift
similarity index 100%
rename from Sources/XXClient/Functors/StoreReceptionIdentity.swift
rename to Sources/XXClient/Functions/StoreReceptionIdentity.swift
diff --git a/Sources/XXClient/Functors/TransmitSingleUse.swift b/Sources/XXClient/Functions/TransmitSingleUse.swift
similarity index 100%
rename from Sources/XXClient/Functors/TransmitSingleUse.swift
rename to Sources/XXClient/Functions/TransmitSingleUse.swift
diff --git a/Sources/XXClient/Functors/UnregisterForNotifications.swift b/Sources/XXClient/Functions/UnregisterForNotifications.swift
similarity index 100%
rename from Sources/XXClient/Functors/UnregisterForNotifications.swift
rename to Sources/XXClient/Functions/UnregisterForNotifications.swift
diff --git a/Sources/XXClient/Functors/UpdateCommonErrors.swift b/Sources/XXClient/Functions/UpdateCommonErrors.swift
similarity index 100%
rename from Sources/XXClient/Functors/UpdateCommonErrors.swift
rename to Sources/XXClient/Functions/UpdateCommonErrors.swift
diff --git a/Sources/XXClient/Group/Functors/GroupGetCreatedMS.swift b/Sources/XXClient/Group/Functions/GroupGetCreatedMS.swift
similarity index 100%
rename from Sources/XXClient/Group/Functors/GroupGetCreatedMS.swift
rename to Sources/XXClient/Group/Functions/GroupGetCreatedMS.swift
diff --git a/Sources/XXClient/Group/Functors/GroupGetCreatedNano.swift b/Sources/XXClient/Group/Functions/GroupGetCreatedNano.swift
similarity index 100%
rename from Sources/XXClient/Group/Functors/GroupGetCreatedNano.swift
rename to Sources/XXClient/Group/Functions/GroupGetCreatedNano.swift
diff --git a/Sources/XXClient/Group/Functors/GroupGetId.swift b/Sources/XXClient/Group/Functions/GroupGetId.swift
similarity index 100%
rename from Sources/XXClient/Group/Functors/GroupGetId.swift
rename to Sources/XXClient/Group/Functions/GroupGetId.swift
diff --git a/Sources/XXClient/Group/Functors/GroupGetInitMessage.swift b/Sources/XXClient/Group/Functions/GroupGetInitMessage.swift
similarity index 100%
rename from Sources/XXClient/Group/Functors/GroupGetInitMessage.swift
rename to Sources/XXClient/Group/Functions/GroupGetInitMessage.swift
diff --git a/Sources/XXClient/Group/Functors/GroupGetMembership.swift b/Sources/XXClient/Group/Functions/GroupGetMembership.swift
similarity index 100%
rename from Sources/XXClient/Group/Functors/GroupGetMembership.swift
rename to Sources/XXClient/Group/Functions/GroupGetMembership.swift
diff --git a/Sources/XXClient/Group/Functors/GroupGetName.swift b/Sources/XXClient/Group/Functions/GroupGetName.swift
similarity index 100%
rename from Sources/XXClient/Group/Functors/GroupGetName.swift
rename to Sources/XXClient/Group/Functions/GroupGetName.swift
diff --git a/Sources/XXClient/Group/Functors/GroupGetTrackedId.swift b/Sources/XXClient/Group/Functions/GroupGetTrackedId.swift
similarity index 100%
rename from Sources/XXClient/Group/Functors/GroupGetTrackedId.swift
rename to Sources/XXClient/Group/Functions/GroupGetTrackedId.swift
diff --git a/Sources/XXClient/Group/Functors/GroupSerialize.swift b/Sources/XXClient/Group/Functions/GroupSerialize.swift
similarity index 100%
rename from Sources/XXClient/Group/Functors/GroupSerialize.swift
rename to Sources/XXClient/Group/Functions/GroupSerialize.swift
diff --git a/Sources/XXClient/GroupChat/Functors/GroupChatGetGroup.swift b/Sources/XXClient/GroupChat/Functions/GroupChatGetGroup.swift
similarity index 100%
rename from Sources/XXClient/GroupChat/Functors/GroupChatGetGroup.swift
rename to Sources/XXClient/GroupChat/Functions/GroupChatGetGroup.swift
diff --git a/Sources/XXClient/GroupChat/Functors/GroupChatGetGroups.swift b/Sources/XXClient/GroupChat/Functions/GroupChatGetGroups.swift
similarity index 100%
rename from Sources/XXClient/GroupChat/Functors/GroupChatGetGroups.swift
rename to Sources/XXClient/GroupChat/Functions/GroupChatGetGroups.swift
diff --git a/Sources/XXClient/GroupChat/Functors/GroupChatJoinGroup.swift b/Sources/XXClient/GroupChat/Functions/GroupChatJoinGroup.swift
similarity index 100%
rename from Sources/XXClient/GroupChat/Functors/GroupChatJoinGroup.swift
rename to Sources/XXClient/GroupChat/Functions/GroupChatJoinGroup.swift
diff --git a/Sources/XXClient/GroupChat/Functors/GroupChatLeaveGroup.swift b/Sources/XXClient/GroupChat/Functions/GroupChatLeaveGroup.swift
similarity index 100%
rename from Sources/XXClient/GroupChat/Functors/GroupChatLeaveGroup.swift
rename to Sources/XXClient/GroupChat/Functions/GroupChatLeaveGroup.swift
diff --git a/Sources/XXClient/GroupChat/Functors/GroupChatMakeGroup.swift b/Sources/XXClient/GroupChat/Functions/GroupChatMakeGroup.swift
similarity index 100%
rename from Sources/XXClient/GroupChat/Functors/GroupChatMakeGroup.swift
rename to Sources/XXClient/GroupChat/Functions/GroupChatMakeGroup.swift
diff --git a/Sources/XXClient/GroupChat/Functors/GroupChatNumGroups.swift b/Sources/XXClient/GroupChat/Functions/GroupChatNumGroups.swift
similarity index 100%
rename from Sources/XXClient/GroupChat/Functors/GroupChatNumGroups.swift
rename to Sources/XXClient/GroupChat/Functions/GroupChatNumGroups.swift
diff --git a/Sources/XXClient/GroupChat/Functors/GroupChatResendRequest.swift b/Sources/XXClient/GroupChat/Functions/GroupChatResendRequest.swift
similarity index 100%
rename from Sources/XXClient/GroupChat/Functors/GroupChatResendRequest.swift
rename to Sources/XXClient/GroupChat/Functions/GroupChatResendRequest.swift
diff --git a/Sources/XXClient/GroupChat/Functors/GroupChatSend.swift b/Sources/XXClient/GroupChat/Functions/GroupChatSend.swift
similarity index 100%
rename from Sources/XXClient/GroupChat/Functors/GroupChatSend.swift
rename to Sources/XXClient/GroupChat/Functions/GroupChatSend.swift
diff --git a/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryConfirmFact.swift b/Sources/XXClient/UserDiscovery/Functions/UserDiscoveryConfirmFact.swift
similarity index 100%
rename from Sources/XXClient/UserDiscovery/Functors/UserDiscoveryConfirmFact.swift
rename to Sources/XXClient/UserDiscovery/Functions/UserDiscoveryConfirmFact.swift
diff --git a/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetContact.swift b/Sources/XXClient/UserDiscovery/Functions/UserDiscoveryGetContact.swift
similarity index 100%
rename from Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetContact.swift
rename to Sources/XXClient/UserDiscovery/Functions/UserDiscoveryGetContact.swift
diff --git a/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetFacts.swift b/Sources/XXClient/UserDiscovery/Functions/UserDiscoveryGetFacts.swift
similarity index 100%
rename from Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetFacts.swift
rename to Sources/XXClient/UserDiscovery/Functions/UserDiscoveryGetFacts.swift
diff --git a/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetId.swift b/Sources/XXClient/UserDiscovery/Functions/UserDiscoveryGetId.swift
similarity index 100%
rename from Sources/XXClient/UserDiscovery/Functors/UserDiscoveryGetId.swift
rename to Sources/XXClient/UserDiscovery/Functions/UserDiscoveryGetId.swift
diff --git a/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryPermanentDeleteAccount.swift b/Sources/XXClient/UserDiscovery/Functions/UserDiscoveryPermanentDeleteAccount.swift
similarity index 100%
rename from Sources/XXClient/UserDiscovery/Functors/UserDiscoveryPermanentDeleteAccount.swift
rename to Sources/XXClient/UserDiscovery/Functions/UserDiscoveryPermanentDeleteAccount.swift
diff --git a/Sources/XXClient/UserDiscovery/Functors/UserDiscoveryRemoveFact.swift b/Sources/XXClient/UserDiscovery/Functions/UserDiscoveryRemoveFact.swift
similarity index 100%
rename from Sources/XXClient/UserDiscovery/Functors/UserDiscoveryRemoveFact.swift
rename to Sources/XXClient/UserDiscovery/Functions/UserDiscoveryRemoveFact.swift
diff --git a/Sources/XXClient/UserDiscovery/Functors/UserDiscoverySendRegisterFact.swift b/Sources/XXClient/UserDiscovery/Functions/UserDiscoverySendRegisterFact.swift
similarity index 100%
rename from Sources/XXClient/UserDiscovery/Functors/UserDiscoverySendRegisterFact.swift
rename to Sources/XXClient/UserDiscovery/Functions/UserDiscoverySendRegisterFact.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerConnect.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerConnect.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerConnect.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerConnect.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerCreate.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerCreate.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerCreate.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerCreate.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerDestroy.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerDestroy.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerDestroy.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerDestroy.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerIsConnected.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerIsConnected.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerIsConnected.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerIsConnected.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerIsCreated.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerIsCreated.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerIsCreated.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerIsCreated.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerIsLoaded.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerIsLoaded.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerIsLoaded.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerIsLoaded.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerIsLoggedIn.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerIsLoggedIn.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerIsLoggedIn.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerIsLoggedIn.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerIsRegistered.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerIsRegistered.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerIsRegistered.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerIsRegistered.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerLoad.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerLoad.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerLoad.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerLoad.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerLogIn.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerLogIn.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerRegister.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerRegister.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegisterAuthCallbacks.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterAuthCallbacks.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerRegisterAuthCallbacks.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterAuthCallbacks.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerStart.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerStart.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerStart.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerStart.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerWaitForNetwork.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerWaitForNetwork.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerWaitForNetwork.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerWaitForNetwork.swift
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerWaitForNodes.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerWaitForNodes.swift
similarity index 100%
rename from Sources/XXMessengerClient/Messenger/Functors/MessengerWaitForNodes.swift
rename to Sources/XXMessengerClient/Messenger/Functions/MessengerWaitForNodes.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerConnectTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerConnectTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerConnectTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerConnectTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerCreateTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerCreateTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerCreateTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerCreateTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerDestroyTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerDestroyTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerDestroyTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerDestroyTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsConnectedTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsConnectedTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsConnectedTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsConnectedTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsCreatedTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsCreatedTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsCreatedTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsCreatedTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsLoadedTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsLoadedTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsLoadedTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsLoadedTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsLoggedInTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsLoggedInTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsLoggedInTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsLoggedInTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsRegisteredTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsRegisteredTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerIsRegisteredTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerIsRegisteredTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLoadTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerLoadTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerLoadTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerLoadTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerLogInTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerLogInTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterAuthCallbacksTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterAuthCallbacksTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterAuthCallbacksTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterAuthCallbacksTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerStartTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerStartTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerWaitForNetworkTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerWaitForNetworkTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerWaitForNetworkTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerWaitForNetworkTests.swift
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerWaitForNodesTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerWaitForNodesTests.swift
similarity index 100%
rename from Tests/XXMessengerClientTests/Messenger/Functors/MessengerWaitForNodesTests.swift
rename to Tests/XXMessengerClientTests/Messenger/Functions/MessengerWaitForNodesTests.swift