diff --git a/AlphaWallet.xcodeproj/project.pbxproj b/AlphaWallet.xcodeproj/project.pbxproj index d16d37705..b68d32cc2 100644 --- a/AlphaWallet.xcodeproj/project.pbxproj +++ b/AlphaWallet.xcodeproj/project.pbxproj @@ -669,6 +669,8 @@ 87B1ACDB28C0D55D0072A5E2 /* tokens.json in Resources */ = {isa = PBXBuildFile; fileRef = 87B1ACDA28C0D55D0072A5E2 /* tokens.json */; }; 87B1AD3728C1FE030072A5E2 /* KeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B1AD3628C1FE030072A5E2 /* KeychainStorage.swift */; }; 87B1B5D928C73C170072A5E2 /* WalletConnectSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 87B1B5D828C73C170072A5E2 /* WalletConnectSwift */; }; + 87B1B5EE28C870D60072A5E2 /* MixpanelService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B1B5EC28C870D60072A5E2 /* MixpanelService.swift */; }; + 87B1B5EF28C870D60072A5E2 /* AnalyticsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B1B5ED28C870D60072A5E2 /* AnalyticsService.swift */; }; 87B651F7256D4BFE000EF927 /* ClaimPaidOrderCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B651F6256D4BFE000EF927 /* ClaimPaidOrderCoordinator.swift */; }; 87B93B0E2726A46500F6EA73 /* BrowserStorageSubscription.js in Resources */ = {isa = PBXBuildFile; fileRef = 87B93B0D2726A46500F6EA73 /* BrowserStorageSubscription.js */; }; 87B93B0F2726C59D00F6EA73 /* content.js in Resources */ = {isa = PBXBuildFile; fileRef = 8703FC0A270366DA0062C416 /* content.js */; }; @@ -1505,6 +1507,8 @@ 87B1ACD828C0D45B0072A5E2 /* chains.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; name = chains.zip; path = AlphaWallet/Resources/chains.zip; sourceTree = SOURCE_ROOT; }; 87B1ACDA28C0D55D0072A5E2 /* tokens.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = tokens.json; path = AlphaWallet/Resources/tokens.json; sourceTree = SOURCE_ROOT; }; 87B1AD3628C1FE030072A5E2 /* KeychainStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorage.swift; sourceTree = ""; }; + 87B1B5EC28C870D60072A5E2 /* MixpanelService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MixpanelService.swift; sourceTree = ""; }; + 87B1B5ED28C870D60072A5E2 /* AnalyticsService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnalyticsService.swift; sourceTree = ""; }; 87B651F6256D4BFE000EF927 /* ClaimPaidOrderCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClaimPaidOrderCoordinator.swift; sourceTree = ""; }; 87B93B0D2726A46500F6EA73 /* BrowserStorageSubscription.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = BrowserStorageSubscription.js; sourceTree = ""; }; 87B93B122726C75900F6EA73 /* helpers.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = helpers.js; sourceTree = ""; }; @@ -3775,6 +3779,7 @@ 87B1ACDD28C0D5C50072A5E2 /* Services */ = { isa = PBXGroup; children = ( + 87B1B5F228C8715F0072A5E2 /* Analytics */, 5E7C7FC75FF544B1DF0B0D8B /* PushNotificationsService.swift */, 875CA90828BF2B720020FA48 /* LocalNotificationService.swift */, 874ED68F27DB48FE001AB374 /* DappRequestHandler.swift */, @@ -3800,6 +3805,15 @@ path = Resources; sourceTree = ""; }; + 87B1B5F228C8715F0072A5E2 /* Analytics */ = { + isa = PBXGroup; + children = ( + 87B1B5ED28C870D60072A5E2 /* AnalyticsService.swift */, + 87B1B5EC28C870D60072A5E2 /* MixpanelService.swift */, + ); + path = Analytics; + sourceTree = ""; + }; 87BBF9682563DD7500FF4846 /* WalletConnect */ = { isa = PBXGroup; children = ( @@ -4353,7 +4367,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Don't run this during index builds\nif [ $ACTION = \"indexbuild\" ]; then exit 0; fi\n\nSCRIPT_PATH=\"${PODS_ROOT}/Apollo/scripts\"\nSCHEMA_PATH=\"${SRCROOT}/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin\"\n\ncd \"${SCHEMA_PATH}\"\n\"${SCRIPT_PATH}\"/run-bundled-codegen.sh codegen:generate --target=swift --includes=./**/*.graphql --localSchemaFile=\"${SCHEMA_PATH}/schema.json\" API.swift\n#Download graphql scheme \n#\"${SCRIPT_PATH}\"/run-bundled-codegen.sh schema:download --endpoint=\"https://cloud.enjin.io/graphql/default\" API.swift\n"; + shellScript = "# Don't run this during index builds\nif [ $ACTION = \"indexbuild\" ]; then exit 0; fi\n\nSCRIPT_PATH=\"${PODS_ROOT}/Apollo/scripts\"\nSCHEMA_PATH=\"${SRCROOT}/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin\"\n\ncd \"${SCHEMA_PATH}\"\n\"${SCRIPT_PATH}\"/run-bundled-codegen.sh codegen:generate --target=swift --includes=./**/*.graphql --localSchemaFile=\"${SCHEMA_PATH}/schema.json\" API.swift\n#Download graphql scheme \n#\"${SCRIPT_PATH}\"/run-bundled-codegen.sh schema:download --endpoint=\"https://cloud.enjin.io/graphql/default\" API.swift\n"; }; 87FBF2B828056D8600616B7D /* Upload debug symbols to Crashlytics */ = { isa = PBXShellScriptBuildPhase; @@ -4937,6 +4951,7 @@ 87F15AEB27F1EA4E00EB9787 /* SwapDetailsView.swift in Sources */, 5E7C772EC476993A170C840B /* GenerateSellMagicLinkViewController.swift in Sources */, 5E7C7AC88DB7EB58FDAF1B21 /* ConfirmSignMessageViewControllerViewModel.swift in Sources */, + 87B1B5EF28C870D60072A5E2 /* AnalyticsService.swift in Sources */, 02334299278480CF00492080 /* AddMultipleCustomRpcModel.swift in Sources */, 87442BD827D615B500EA2209 /* CheckTransactionStateViewController.swift in Sources */, 5E7C7A67B6143DFB9B1CF02B /* ConfirmSignMessageTableViewCell.swift in Sources */, @@ -5184,6 +5199,7 @@ 5E7C75BA61A6F4D300D1DA3E /* WhatsNew.swift in Sources */, 5E7C73A66AD0CF28767CC142 /* WhatsNewListingCoordinator.swift in Sources */, 5E7C793EEF16E1689FE62543 /* WhatsNewListingViewController.swift in Sources */, + 87B1B5EE28C870D60072A5E2 /* MixpanelService.swift in Sources */, 5E7C7FF312AB61DBEBD86C94 /* WhatsNewViewModels.swift in Sources */, 02F4E8B627715EA000D89C19 /* SaveCustomRpcOverallViewController.swift in Sources */, 5E7C7CC1E06FFC3A5BEBF1EC /* WhatsNewViews.swift in Sources */, diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Coordinators/AnalyticsService.swift b/AlphaWallet/Common/Services/Analytics/AnalyticsService.swift similarity index 82% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Coordinators/AnalyticsService.swift rename to AlphaWallet/Common/Services/Analytics/AnalyticsService.swift index 5662f8aa0..b192873ed 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Coordinators/AnalyticsService.swift +++ b/AlphaWallet/Common/Services/Analytics/AnalyticsService.swift @@ -6,18 +6,10 @@ // import Foundation -import UIKit - -public protocol AnalyticsServiceType: AnalyticsLogger { - func applicationDidBecomeActive() - func application(continue userActivity: NSUserActivity) - func application(open url: URL, sourceApplication: String?, annotation: Any) - func application(open url: URL, options: [UIApplication.OpenURLOptionsKey: Any]) - func application(didReceiveRemoteNotification userInfo: [AnyHashable: Any]) -} +import AlphaWalletFoundation public final class AnalyticsService: NSObject, AnalyticsServiceType { - private var mixpanelService: MixpanelCoordinator? + private var mixpanelService: MixpanelService? private var config: Config public init(config: Config = .init()) { @@ -28,7 +20,7 @@ public final class AnalyticsService: NSObject, AnalyticsServiceType { self.config.sendAnalyticsEnabled = Features.default.isAvailable(.isAnalyticsUIEnabled) } if Constants.Credentials.analyticsKey.nonEmpty && !Environment.isTestFlight { - mixpanelService = MixpanelCoordinator(withKey: Constants.Credentials.analyticsKey) + mixpanelService = MixpanelService(withKey: Constants.Credentials.analyticsKey) } } diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Coordinators/MixpanelCoordinator.swift b/AlphaWallet/Common/Services/Analytics/MixpanelService.swift similarity index 95% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Coordinators/MixpanelCoordinator.swift rename to AlphaWallet/Common/Services/Analytics/MixpanelService.swift index 3fb30d497..c3ac9b6a1 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Coordinators/MixpanelCoordinator.swift +++ b/AlphaWallet/Common/Services/Analytics/MixpanelService.swift @@ -1,9 +1,10 @@ // Copyright © 2020 Stormbird PTE. LTD. import Foundation +import AlphaWalletFoundation import Mixpanel -public class MixpanelCoordinator { +public class MixpanelService { private var mixpanelInstance: MixpanelInstance { Mixpanel.mainInstance() } @@ -18,7 +19,7 @@ public class MixpanelCoordinator { } } -extension MixpanelCoordinator: AnalyticsLogger { +extension MixpanelService: AnalyticsLogger { public func log(navigation: AnalyticsNavigation, properties: [String: AnalyticsEventPropertyValue]?) { let props: Properties? = properties?.compactMapValues(convertParameterToSdkSpecificVersion) mixpanelInstance.track(event: navigation.rawValue, properties: props) diff --git a/AlphaWalletTests/Coordinators/MixpanelCoordinatorTests.swift b/AlphaWalletTests/Coordinators/MixpanelCoordinatorTests.swift index eab3a9a74..77b68ffee 100644 --- a/AlphaWalletTests/Coordinators/MixpanelCoordinatorTests.swift +++ b/AlphaWalletTests/Coordinators/MixpanelCoordinatorTests.swift @@ -11,7 +11,7 @@ import AlphaWalletFoundation class MixpanelCoordinatorTests: XCTestCase { func testMixpanelSdkTypeConvertation() { - let coordinator = MixpanelCoordinator(withKey: "") + let coordinator = MixpanelService(withKey: "") let values: [AnalyticsEventPropertyValue] = [ "Hello AlphaWallet", 1, diff --git a/Podfile.lock b/Podfile.lock index 886cfba7a..007afa9b3 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -32,7 +32,6 @@ PODS: - Kanna - Kingfisher (~> 7.0) - MailchimpSDK - - Mixpanel-swift - Moya (~> 10.0.1) - PaperTrailLumberjack/Swift - PromiseKit/Alamofire @@ -307,7 +306,7 @@ SPEC CHECKSUMS: AlphaWalletAddress: 62a69f5ccc7d6d17abf878c4274f4c3d5fdc97ba AlphaWalletCore: 451c8a4dfdba1d3b59a3ac47bf0dcabcf1f4c049 AlphaWalletENS: a93a871ad5d8a8c78cd87b60eb59fccf4b23e841 - AlphaWalletFoundation: 53981b803199dd6d0537cbc341772c68a260105c + AlphaWalletFoundation: 25f271d526c6a02fcaafcd0a5caaf41e9fd00edd AlphaWalletGoBack: 935efdbd98fa80039f2a350cde5b3a50cea46564 AlphaWalletOpenSea: 11ccb06ae0200dadc2b3f7c3e223f407ac3a22b4 AlphaWalletWeb3Provider: 7ca1e1c1dc841dc1915f970daace48bf34931655 diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation.podspec b/modules/AlphaWalletFoundation/AlphaWalletFoundation.podspec index 3dd28b2c1..c3524cf86 100644 --- a/modules/AlphaWalletFoundation/AlphaWalletFoundation.podspec +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |spec| spec.platform = :ios, "13.0" spec.source = { :git => 'git@github.com:AlphaWallet/alpha-wallet-ios.git', :tag => "#{spec.version}" } spec.source_files = 'AlphaWalletFoundation/**/*.{h,m,swift}' - spec.resources = ['AlphaWalletFoundation/Core/Tokens/PopularTokens/known_contract.json'] + spec.resource_bundles = {'AlphaWalletFoundation' => ['AlphaWalletFoundation/**/*.{graphql,json}'] } spec.pod_target_xcconfig = { 'SWIFT_OPTIMIZATION_LEVEL' => '-Owholemodule' } spec.dependency 'BigInt', '~> 3.1' @@ -39,7 +39,6 @@ Pod::Spec.new do |spec| spec.dependency 'PromiseKit/Alamofire' spec.dependency 'Kanna' spec.dependency 'TrustWalletCore', '2.6.34' - spec.dependency 'Mixpanel-swift' spec.dependency 'EthereumABI' spec.dependency 'BlockiesSwift' spec.dependency 'PaperTrailLumberjack/Swift' diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/ActivitiesPipeLine.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivitiesPipeLine.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/ActivitiesPipeLine.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivitiesPipeLine.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/ActivitiesService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivitiesService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/ActivitiesService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivitiesService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/ActivityCollection.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivityCollection.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/ActivityCollection.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivityCollection.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/ActivityRowModel.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivityRowModel.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/ActivityRowModel.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/ActivityRowModel.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/Types/ActivitiesFilterStrategy.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/Types/ActivitiesFilterStrategy.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/Types/ActivitiesFilterStrategy.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/Types/ActivitiesFilterStrategy.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/Types/ActivityOrTransactionInstance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/Types/ActivityOrTransactionInstance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Activities/Types/ActivityOrTransactionInstance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Activities/Types/ActivityOrTransactionInstance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Alerts/PriceAlertDataStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Alerts/PriceAlertDataStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Alerts/PriceAlertDataStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Alerts/PriceAlertDataStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Alerts/PriceAlertService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Alerts/PriceAlertService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Alerts/PriceAlertService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Alerts/PriceAlertService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Alerts/Types/PriceAlert.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Alerts/Types/PriceAlert.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Alerts/Types/PriceAlert.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Alerts/Types/PriceAlert.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Models/AnalyticsEventPropertyValue.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsEventPropertyValue.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Models/AnalyticsEventPropertyValue.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsEventPropertyValue.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Coordinators/AnalyticsCoordinator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsLogger.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Coordinators/AnalyticsCoordinator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsLogger.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsServiceType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsServiceType.swift new file mode 100644 index 000000000..9f5432828 --- /dev/null +++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsServiceType.swift @@ -0,0 +1,16 @@ +// +// AnalyticsServiceType.swift +// AlphaWalletFoundation +// +// Created by Vladyslav Shepitko on 07.09.2022. +// + +import Foundation + +public protocol AnalyticsServiceType: AnalyticsLogger { + func applicationDidBecomeActive() + func application(continue userActivity: NSUserActivity) + func application(open url: URL, sourceApplication: String?, annotation: Any) + func application(open url: URL, options: [UIApplication.OpenURLOptionsKey: Any]) + func application(didReceiveRemoteNotification userInfo: [AnyHashable: Any]) +} diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Models/AnalyticsTypes.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsTypes.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Analytics/Models/AnalyticsTypes.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsTypes.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Blockies/BlockieGenerator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Blockies/BlockieGenerator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Blockies/BlockieGenerator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Blockies/BlockieGenerator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Blockies/BlockiesImage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Blockies/BlockiesImage.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Blockies/BlockiesImage.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Blockies/BlockiesImage.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BlockscanChat/BlockscanChat.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/BlockscanChat/BlockscanChat.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BlockscanChat/BlockscanChat.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/BlockscanChat/BlockscanChat.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BlockscanChat/BlockscanChatService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/BlockscanChat/BlockscanChatService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BlockscanChat/BlockscanChatService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/BlockscanChat/BlockscanChatService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Factory/WKWebViewConfiguration.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Factory/WKWebViewConfiguration.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Factory/WKWebViewConfiguration.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Factory/WKWebViewConfiguration.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Models/Dapp.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Models/Dapp.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Models/Dapp.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Models/Dapp.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Models/EmptyDapps.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Models/EmptyDapps.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Models/EmptyDapps.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Models/EmptyDapps.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Models/ScanQRCodeResolution.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Models/ScanQRCodeResolution.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Models/ScanQRCodeResolution.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Models/ScanQRCodeResolution.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Models/SwitchChainRequestConfiguration.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Models/SwitchChainRequestConfiguration.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Models/SwitchChainRequestConfiguration.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Models/SwitchChainRequestConfiguration.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Storage/BookmarksStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Storage/BookmarksStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Storage/BookmarksStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Storage/BookmarksStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Storage/HistoryStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Storage/HistoryStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Storage/HistoryStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Storage/HistoryStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/Bookmark.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/Bookmark.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/Bookmark.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/Bookmark.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/BrowserMessageType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/BrowserMessageType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/BrowserMessageType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/BrowserMessageType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/BrowserURLParser.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/BrowserURLParser.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/BrowserURLParser.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/BrowserURLParser.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/DAppError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/DAppError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/DAppError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/DAppError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/DappAction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/DappAction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/DappAction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/DappAction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/DappCommand.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/DappCommand.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/DappCommand.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/DappCommand.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/Favicon.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/Favicon.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/Favicon.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/Favicon.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/History.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/History.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/History.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/History.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/Method.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/Method.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/Method.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/Method.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/RequesterViewModel.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/RequesterViewModel.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Browser/Types/RequesterViewModel.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/RequesterViewModel.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BuyToken/BuyTokenService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/BuyTokenService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BuyToken/BuyTokenService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/BuyTokenService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BuyToken/CoinBase/CoinBase.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/CoinBase/CoinBase.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BuyToken/CoinBase/CoinBase.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/CoinBase/CoinBase.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BuyToken/Ramp/Ramp.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/Ramp/Ramp.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/BuyToken/Ramp/Ramp.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/BuyToken/Ramp/Ramp.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinGecko/CoinGeckoNetworkProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoNetworkProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinGecko/CoinGeckoNetworkProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoNetworkProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinGecko/CoinGeckoTickerIdsFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoTickerIdsFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinGecko/CoinGeckoTickerIdsFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoTickerIdsFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinGecko/CoinGeckoTickersFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoTickersFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinGecko/CoinGeckoTickersFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinGecko/CoinGeckoTickersFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinTickersFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinTickersFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinTickersFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinTickersFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinTickersStorage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinTickersStorage.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/CoinTickersStorage.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/CoinTickersStorage.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/CoinTicker.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/CoinTicker.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/CoinTicker.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/CoinTicker.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/InMemoryTickerIdsFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/InMemoryTickerIdsFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/InMemoryTickerIdsFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/InMemoryTickerIdsFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/TickerId.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/TickerId.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/TickerId.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/TickerId.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/TickerIdFilter.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/TickerIdFilter.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/TickerIdFilter.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/TickerIdFilter.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/TickerIdsFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/TickerIdsFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/TickerIdsFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/TickerIdsFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/TokenMappedToTicker.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/TokenMappedToTicker.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/Types/TokenMappedToTicker.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/Types/TokenMappedToTicker.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/tokens_2.json b/modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/tokens_2.json similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/CoinTicker/tokens_2.json rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/CoinTicker/tokens_2.json diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/DomainResolutionService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/DomainResolutionService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/DomainResolutionService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/DomainResolutionService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/ENSDelegateImpl.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/ENSDelegateImpl.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/ENSDelegateImpl.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/ENSDelegateImpl.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/EnsResolver.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/EnsResolver.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/EnsResolver.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/EnsResolver.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/EnsReverseResolver.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/EnsReverseResolver.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/EnsReverseResolver.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/EnsReverseResolver.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/GetEnsTextRecord.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/GetEnsTextRecord.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/GetEnsTextRecord.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/GetEnsTextRecord.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Storage/EnsRecordsStorage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Storage/EnsRecordsStorage.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Storage/EnsRecordsStorage.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Storage/EnsRecordsStorage.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/AddressOrEnsName.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/AddressOrEnsName.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/AddressOrEnsName.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/AddressOrEnsName.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/AddressOrEnsResolution.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/AddressOrEnsResolution.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/AddressOrEnsResolution.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/AddressOrEnsResolution.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/DomainResolutionServiceType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/DomainResolutionServiceType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/DomainResolutionServiceType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/DomainResolutionServiceType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/EnsLookupKey.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/EnsLookupKey.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/EnsLookupKey.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/EnsLookupKey.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/EnsRecord.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/EnsRecord.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/EnsRecord.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/EnsRecord.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/EnsRecordObject.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/EnsRecordObject.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/Types/EnsRecordObject.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/Types/EnsRecordObject.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/UnstoppableDomains/UnstoppableDomainsV2Resolver.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/UnstoppableDomains/UnstoppableDomainsV2Resolver.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/ENS/UnstoppableDomains/UnstoppableDomainsV2Resolver.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/ENS/UnstoppableDomains/UnstoppableDomainsV2Resolver.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/CastError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/CastError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/CastError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/CastError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/ChainState.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ChainState.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/ChainState.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ChainState.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/ChainStateSchedulerProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ChainStateSchedulerProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/ChainStateSchedulerProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ChainStateSchedulerProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/EIP712TypedData.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/EIP712TypedData.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/EIP712TypedData.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/EIP712TypedData.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/EthTypedData.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/EthTypedData.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/EthTypedData.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/EthTypedData.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/EtherServiceRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/EtherServiceRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/EtherServiceRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/EtherServiceRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/ImportType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ImportType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/ImportType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/ImportType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/KeyStoreError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/KeyStoreError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/KeyStoreError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/KeyStoreError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetBlockNumber.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetBlockNumber.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetBlockNumber.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetBlockNumber.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetGasPrice.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetGasPrice.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetGasPrice.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetGasPrice.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetIsTransactionCompleted.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetIsTransactionCompleted.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetIsTransactionCompleted.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetIsTransactionCompleted.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetNextNonce.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetNextNonce.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetNextNonce.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetNextNonce.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetPendingTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetPendingTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/GetPendingTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/GetPendingTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/WaitTillTransactionCompleted.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/WaitTillTransactionCompleted.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Models/WaitTillTransactionCompleted.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Models/WaitTillTransactionCompleted.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/PasswordGenerator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/PasswordGenerator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/PasswordGenerator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/PasswordGenerator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/RLP.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/RLP.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/RLP.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/RLP.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/BalanceRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/BalanceRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/BalanceRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/BalanceRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/BlockNumber.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/BlockNumber.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/BlockNumber.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/BlockNumber.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/DASLookupRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/DASLookupRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/DASLookupRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/DASLookupRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/EstimateGasRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/EstimateGasRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/EstimateGasRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/EstimateGasRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/EthCalllRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/EthCalllRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/EthCalllRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/EthCalllRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/EthChainIdRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/EthChainIdRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/EthChainIdRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/EthChainIdRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/GasPriceRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/GasPriceRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/GasPriceRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/GasPriceRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/GetTransactionCountRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/GetTransactionCountRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/GetTransactionCountRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/GetTransactionCountRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/GetTransactionRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/GetTransactionRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/GetTransactionRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/GetTransactionRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/SendRawTransactionRequest.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/SendRawTransactionRequest.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Requests/SendRawTransactionRequest.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Requests/SendRawTransactionRequest.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TransactionSigning.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TransactionSigning.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TransactionSigning.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TransactionSigning.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/AlphaWalletService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/AlphaWalletService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/AlphaWalletService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/AlphaWalletService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/Models/ArrayResponse.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/Models/ArrayResponse.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/Models/ArrayResponse.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/Models/ArrayResponse.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/Models/LocalizedOperation.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/Models/LocalizedOperation.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/Models/LocalizedOperation.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/Models/LocalizedOperation.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/Models/OperationType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/Models/OperationType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/Models/OperationType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/Models/OperationType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/Models/RawTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/Models/RawTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/TrustClient/Models/RawTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/TrustClient/Models/RawTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Wallet.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Wallet.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/Wallet.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/Wallet.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/bignumber.min.js b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/bignumber.min.js similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/EtherClient/bignumber.min.js rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/bignumber.min.js diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABI.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABI.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABI.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABI.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABIEncoder.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABIEncoder.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABIEncoder.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABIEncoder.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABIError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABIError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABIError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABIError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABIType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABIType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABIType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABIType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABIValue.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABIValue.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ABIValue.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ABIValue.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/DecodedFunctionCall+Decode.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/DecodedFunctionCall+Decode.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/DecodedFunctionCall+Decode.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/DecodedFunctionCall+Decode.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/DecodedFunctionCall.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/DecodedFunctionCall.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/DecodedFunctionCall.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/DecodedFunctionCall.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ERC1155.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ERC1155.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ERC1155.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ERC1155.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ERC20.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ERC20.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ERC20.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ERC20.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ERC721.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ERC721.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/ERC721.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/ERC721.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/Function.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/Function.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/ABI/Function.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/ABI/Function.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/Erc20.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/Erc20.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/Erc20.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/Erc20.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/EthereumTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/EthereumTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Ethereum/EthereumTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Ethereum/EthereumTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Export/Models/BackupState.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Export/Models/BackupState.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Export/Models/BackupState.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Export/Models/BackupState.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Address.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Address.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Address.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Address.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Array.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Array.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Array.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Array.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Bundle.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Bundle.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Bundle.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Bundle.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Data.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Data.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Data.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Data.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Date.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Date.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Date.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Date.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Decimal.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Decimal.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Decimal.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Decimal.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Dictionary.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Dictionary.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Dictionary.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Dictionary.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Double.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Double.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Double.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Double.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Error.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Error.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Error.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Error.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Int.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Int.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Int.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Int.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/MimeType+Extension.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/MimeType+Extension.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/MimeType+Extension.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/MimeType+Extension.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/NSAttributedString.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/NSAttributedString.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/NSAttributedString.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/NSAttributedString.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/NSObject.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/NSObject.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/NSObject.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/NSObject.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Optional.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Optional.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Optional.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Optional.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Publishers/AnyCancellable.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Publishers/AnyCancellable.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Publishers/AnyCancellable.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Publishers/AnyCancellable.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Publishers/NotificationCenter+Publishers.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Publishers/NotificationCenter+Publishers.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Publishers/NotificationCenter+Publishers.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Publishers/NotificationCenter+Publishers.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Publishers/Session+Publishers.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Publishers/Session+Publishers.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Publishers/Session+Publishers.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Publishers/Session+Publishers.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Session+PromiseKit.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Session+PromiseKit.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/Session+PromiseKit.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/Session+PromiseKit.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/String.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/String.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/String.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/String.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/UIImage+tokenSymbolBackgroundImage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/UIImage+tokenSymbolBackgroundImage.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/UIImage+tokenSymbolBackgroundImage.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/UIImage+tokenSymbolBackgroundImage.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/WKWebViewExtension.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/WKWebViewExtension.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Extensions/WKWebViewExtension.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Extensions/WKWebViewExtension.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Features/Features.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Features/Features.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Features/Features.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Features/Features.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Coordinator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Coordinator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Coordinator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Coordinator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/CoordinatorThatEnds.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/CoordinatorThatEnds.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/CoordinatorThatEnds.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/CoordinatorThatEnds.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/CryptoAddressValidator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/CryptoAddressValidator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/CryptoAddressValidator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/CryptoAddressValidator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Eip681Parser.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Eip681Parser.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Eip681Parser.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Eip681Parser.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/EtherNumberFormatter.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/EtherNumberFormatter.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/EtherNumberFormatter.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/EtherNumberFormatter.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Formatter.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Formatter.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Formatter.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Formatter.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/QRCodeValueParser.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/QRCodeValueParser.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/QRCodeValueParser.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/QRCodeValueParser.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Repeat.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Repeat.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Repeat.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Repeat.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/StringFormatter.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/StringFormatter.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/StringFormatter.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/StringFormatter.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Subscribable.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Subscribable.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Foundation/Subscribable.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Foundation/Subscribable.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/GasPriceEstimator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/GasPriceEstimator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/GasPriceEstimator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/GasPriceEstimator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/Models/EtherscanGasPriceEstimator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/Models/EtherscanGasPriceEstimator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/Models/EtherscanGasPriceEstimator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/Models/EtherscanGasPriceEstimator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/Models/GasEstimates.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/Models/GasEstimates.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/Models/GasEstimates.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/Models/GasEstimates.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/Models/GasPriceEstimates.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/Models/GasPriceEstimates.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/Models/GasPriceEstimates.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/Models/GasPriceEstimates.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/Models/UnitConfiguration.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/Models/UnitConfiguration.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/GasPriceEstimator/Models/UnitConfiguration.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/GasPriceEstimator/Models/UnitConfiguration.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/AlphaWalletProviderFactory.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/AlphaWalletProviderFactory.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/AlphaWalletProviderFactory.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/AlphaWalletProviderFactory.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Core.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Core.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Core.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Core.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Device.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Device.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Device.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Device.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/DeviceChecker.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/DeviceChecker.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/DeviceChecker.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/DeviceChecker.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/EmailList.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/EmailList.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/EmailList.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/EmailList.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Environment.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Environment.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Environment.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Environment.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ExecuteOnceOnly.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ExecuteOnceOnly.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ExecuteOnceOnly.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ExecuteOnceOnly.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/FeedbackGenerator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/FeedbackGenerator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/FeedbackGenerator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/FeedbackGenerator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/JailbreakChecker.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/JailbreakChecker.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/JailbreakChecker.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/JailbreakChecker.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ReachabilityManager.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ReachabilityManager.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ReachabilityManager.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ReachabilityManager.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/RemoteLogger.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/RemoteLogger.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/RemoteLogger.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/RemoteLogger.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ReportService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ReportService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ReportService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ReportService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/RestartQueueHandler.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/RestartQueueHandler.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/RestartQueueHandler.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/RestartQueueHandler.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ScreenChecker.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ScreenChecker.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ScreenChecker.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ScreenChecker.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ScriptMessageProxy.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ScriptMessageProxy.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/ScriptMessageProxy.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/ScriptMessageProxy.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/StringValidator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/StringValidator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/StringValidator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/StringValidator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Validators/EthereumAddressValidator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Validators/EthereumAddressValidator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Validators/EthereumAddressValidator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Validators/EthereumAddressValidator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Validators/MnemonicInWordListValidator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Validators/MnemonicInWordListValidator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Validators/MnemonicInWordListValidator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Validators/MnemonicInWordListValidator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Validators/MnemonicLengthValidator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Validators/MnemonicLengthValidator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Validators/MnemonicLengthValidator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Validators/MnemonicLengthValidator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Validators/PrivateKeyValidator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Validators/PrivateKeyValidator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/Validators/PrivateKeyValidator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/Validators/PrivateKeyValidator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/WalletStorage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/WalletStorage.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Helpers/WalletStorage.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Helpers/WalletStorage.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/CleanupPasscode.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/CleanupPasscode.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/CleanupPasscode.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/CleanupPasscode.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/CleanupWallets.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/CleanupWallets.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/CleanupWallets.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/CleanupWallets.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/ConfigureApp.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/ConfigureApp.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/ConfigureApp.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/ConfigureApp.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/ConfigureImageStorage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/ConfigureImageStorage.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/ConfigureImageStorage.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/ConfigureImageStorage.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/DatabaseMigration.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/DatabaseMigration.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/DatabaseMigration.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/DatabaseMigration.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/Initializer.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/Initializer.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/Initializer.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/Initializer.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/MigrationInitializerForOneChainPerDatabase.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/MigrationInitializerForOneChainPerDatabase.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/MigrationInitializerForOneChainPerDatabase.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/MigrationInitializerForOneChainPerDatabase.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/ReportUsersActiveChains.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/ReportUsersActiveChains.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/ReportUsersActiveChains.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/ReportUsersActiveChains.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/ReportUsersWalletAddresses.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/ReportUsersWalletAddresses.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/ReportUsersWalletAddresses.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/ReportUsersWalletAddresses.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/SkipBackupFiles.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/SkipBackupFiles.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Initializers/SkipBackupFiles.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Initializers/SkipBackupFiles.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/DefaultsWalletAddressesStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/DefaultsWalletAddressesStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/DefaultsWalletAddressesStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/DefaultsWalletAddressesStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/EtherKeystore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/EtherKeystore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/EtherKeystore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/EtherKeystore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/EthereumSigner.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/EthereumSigner.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/EthereumSigner.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/EthereumSigner.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/HDWallet+Extension.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/HDWallet+Extension.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/HDWallet+Extension.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/HDWallet+Extension.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/JsonWalletAddressesStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/JsonWalletAddressesStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/JsonWalletAddressesStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/JsonWalletAddressesStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/Keystore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/Keystore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/Keystore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/Keystore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/LegacyFileBasedKeystore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/LegacyFileBasedKeystore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/LegacyFileBasedKeystore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/LegacyFileBasedKeystore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/SecureEnclave.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/SecureEnclave.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/SecureEnclave.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/SecureEnclave.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/WalletAddressesStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/WalletAddressesStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/KeyManagement/WalletAddressesStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/KeyManagement/WalletAddressesStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Lock/Lock.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Lock/Lock.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Lock/Lock.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Lock/Lock.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Market/OrderHandler.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Market/OrderHandler.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Market/OrderHandler.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Market/OrderHandler.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Market/UniversalLinkHandler.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Market/UniversalLinkHandler.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Market/UniversalLinkHandler.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Market/UniversalLinkHandler.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/API.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/API.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/API.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/API.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/Enjin.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/Enjin.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/Enjin.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/Enjin.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinBalances.graphql b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinBalances.graphql similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinBalances.graphql rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinBalances.graphql diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinNetworkProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinNetworkProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinNetworkProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinNetworkProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinOauth.graphql b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinOauth.graphql similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinOauth.graphql rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinOauth.graphql diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinToken.graphql b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinToken.graphql similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinToken.graphql rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinToken.graphql diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinUserManagementInterceptor.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinUserManagementInterceptor.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/EnjinUserManagementInterceptor.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/EnjinUserManagementInterceptor.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/schema.json b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/schema.json similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin/schema.json rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin/schema.json diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/NFTProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/NFTProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/NFTProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/NFTProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/OpenSea.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/OpenSea.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/OpenSea.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/OpenSea.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/OpenSeaNetworkProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/OpenSeaNetworkProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/OpenSeaNetworkProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/OpenSeaNetworkProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/Types/NonFungibleFromJson+Extension.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/Types/NonFungibleFromJson+Extension.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/Types/NonFungibleFromJson+Extension.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/Types/NonFungibleFromJson+Extension.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/Types/NonFungibleFromJsonTokenType+Extension.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/Types/NonFungibleFromJsonTokenType+Extension.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/Types/NonFungibleFromJsonTokenType+Extension.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/Types/NonFungibleFromJsonTokenType+Extension.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/Types/OpenSeaNonFungible+Extension.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/Types/OpenSeaNonFungible+Extension.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/Types/OpenSeaNonFungible+Extension.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/Types/OpenSeaNonFungible+Extension.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/Types/OpenSeaNonFungibleTokenHandling.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/Types/OpenSeaNonFungibleTokenHandling.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/OpenSea/Types/OpenSeaNonFungibleTokenHandling.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/OpenSea/Types/OpenSeaNonFungibleTokenHandling.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Notifications/LocalNotification.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Notifications/LocalNotification.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Notifications/LocalNotification.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Notifications/LocalNotification.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Notifications/NotificationService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Notifications/NotificationService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Notifications/NotificationService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Notifications/NotificationService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Notifications/ScheduledNotificationService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Notifications/ScheduledNotificationService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Notifications/ScheduledNotificationService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Notifications/ScheduledNotificationService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Notifications/TransactionNotificationService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Notifications/TransactionNotificationService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Notifications/TransactionNotificationService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Notifications/TransactionNotificationService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetERC721BalanceEncode.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetERC721BalanceEncode.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetERC721BalanceEncode.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetERC721BalanceEncode.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetERC721ForTicketsBalance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetERC721ForTicketsBalance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetERC721ForTicketsBalance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetERC721ForTicketsBalance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetERC875Balance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetERC875Balance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetERC875Balance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetERC875Balance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetInterfaceSupported165Encode.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetInterfaceSupported165Encode.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetInterfaceSupported165Encode.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetInterfaceSupported165Encode.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetIsERC875Encode.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetIsERC875Encode.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetIsERC875Encode.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetIsERC875Encode.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetTokenUri.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetTokenUri.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/RPC/Commands/web3swift-pod/GetTokenUri.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/RPC/Commands/web3swift-pod/GetTokenUri.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Redeem/CreateRedeem.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Redeem/CreateRedeem.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Redeem/CreateRedeem.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Redeem/CreateRedeem.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Redeem/Models/Arguments.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Redeem/Models/Arguments.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Redeem/Models/Arguments.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Redeem/Models/Arguments.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Redeem/Models/Event.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Redeem/Models/Event.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Redeem/Models/Event.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Redeem/Models/Event.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Redeem/SignatureHelper.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Redeem/SignatureHelper.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Redeem/SignatureHelper.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Redeem/SignatureHelper.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Rpc Network/AvailableRpcNetwork.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Rpc Network/AvailableRpcNetwork.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Rpc Network/AvailableRpcNetwork.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Rpc Network/AvailableRpcNetwork.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Rpc Network/SaveCustomRpcManualEntryViewModel.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Rpc Network/SaveCustomRpcManualEntryViewModel.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Rpc Network/SaveCustomRpcManualEntryViewModel.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Rpc Network/SaveCustomRpcManualEntryViewModel.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/AddCustomChain.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/AddCustomChain.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/AddCustomChain.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/AddCustomChain.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/EnableChain.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/EnableChain.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/EnableChain.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/EnableChain.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/LiveLocaleSwitcherBundle.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/LiveLocaleSwitcherBundle.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/LiveLocaleSwitcherBundle.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/LiveLocaleSwitcherBundle.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/SaveCustomRpcOverallModel.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/SaveCustomRpcOverallModel.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/SaveCustomRpcOverallModel.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/SaveCustomRpcOverallModel.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/SaveOperationType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/SaveOperationType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/SaveOperationType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/SaveOperationType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/SendPrivateTransactionsProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/SendPrivateTransactionsProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Models/SendPrivateTransactionsProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Models/SendPrivateTransactionsProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/AppLocale.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/AppLocale.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/AppLocale.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/AppLocale.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/BiometryAuthenticationType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/BiometryAuthenticationType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/BiometryAuthenticationType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/BiometryAuthenticationType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/Config.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/Config.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/Config.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/Config.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/ConfigExplorer.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/ConfigExplorer.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/ConfigExplorer.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/ConfigExplorer.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/Constants+Credentials.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/Constants+Credentials.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/Constants+Credentials.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/Constants+Credentials.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/Constants.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/Constants.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/Constants.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/Constants.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/Currency.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/Currency.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/Currency.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/Currency.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/CurrencyRate.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/CurrencyRate.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/CurrencyRate.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/CurrencyRate.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/CustomRPC.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/CustomRPC.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/CustomRPC.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/CustomRPC.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/RPCServers.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/RPCServers.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/RPCServers.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/RPCServers.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/SearchEngine.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/SearchEngine.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/SearchEngine.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/SearchEngine.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/SendInputErrors.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/SendInputErrors.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/SendInputErrors.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/SendInputErrors.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/ServiceProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/ServiceProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Settings/Types/ServiceProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Settings/Types/ServiceProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Share/ShareContentAction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Share/ShareContentAction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Share/ShareContentAction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Share/ShareContentAction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/ArbitrumBridge.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/ArbitrumBridge.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/ArbitrumBridge.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/ArbitrumBridge.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Carthage/Carthage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Carthage/Carthage.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Carthage/Carthage.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Carthage/Carthage.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/HoneySwap/HoneySwap.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/HoneySwap/HoneySwap.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/HoneySwap/HoneySwap.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/HoneySwap/HoneySwap.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/HoneySwap/HoneySwapERC20Token.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/HoneySwap/HoneySwapERC20Token.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/HoneySwap/HoneySwapERC20Token.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/HoneySwap/HoneySwapERC20Token.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/ApproveSwapProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/ApproveSwapProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/ApproveSwapProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/ApproveSwapProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/SwapOptionsConfigurator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/SwapOptionsConfigurator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/SwapOptionsConfigurator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/SwapOptionsConfigurator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/SwapTokenSelectionProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/SwapTokenSelectionProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/SwapTokenSelectionProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/SwapTokenSelectionProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/TokenSwapperNetworkProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/TokenSwapperNetworkProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/TokenSwapperNetworkProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/TokenSwapperNetworkProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/TokenSwapperStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/TokenSwapperStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Helpers/TokenSwapperStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Helpers/TokenSwapperStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Swap.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Swap.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Swap.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Swap.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/SwapEstimate.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/SwapEstimate.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/SwapEstimate.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/SwapEstimate.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/SwapPairs.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/SwapPairs.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/SwapPairs.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/SwapPairs.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/SwapQuote.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/SwapQuote.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/SwapQuote.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/SwapQuote.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/SwappableToken.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/SwappableToken.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/SwappableToken.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/SwappableToken.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/TokenSwapper.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/TokenSwapper.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/TokenSwapper.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/TokenSwapper.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/FromAndToTokens.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/FromAndToTokens.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/FromAndToTokens.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/FromAndToTokens.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapPair.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapPair.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapPair.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapPair.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapQuoteState.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapQuoteState.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapQuoteState.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapQuoteState.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapSlippage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapSlippage.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/SwapSlippage.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapSlippage.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/TokenSelection.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/TokenSelection.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/TokenSelection.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/TokenSelection.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/TokenSwapperError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/TokenSwapperError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/TokenSwapperError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/TokenSwapperError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/TokenSwapperLoadingState.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/TokenSwapperLoadingState.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/TokenSwapperLoadingState.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/TokenSwapperLoadingState.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/TokenToSwap.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/TokenToSwap.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/Types/TokenToSwap.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/TokenToSwap.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/UnsignedSwapTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/UnsignedSwapTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/NativeSwap/UnsignedSwapTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/UnsignedSwapTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Oneinch/ERC20Token.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Oneinch/ERC20Token.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Oneinch/ERC20Token.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Oneinch/ERC20Token.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Oneinch/Oneinch.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Oneinch/Oneinch.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Oneinch/Oneinch.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Oneinch/Oneinch.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/QuickSwap/QuickSwap.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/QuickSwap/QuickSwap.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/QuickSwap/QuickSwap.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/QuickSwap/QuickSwap.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/SwapTokenUsing.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/SwapTokenUsing.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/SwapTokenUsing.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/SwapTokenUsing.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Uniswap/Uniswap.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Uniswap/Uniswap.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Uniswap/Uniswap.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Uniswap/Uniswap.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Uniswap/UniswapERC20Token.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Uniswap/UniswapERC20Token.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/Uniswap/UniswapERC20Token.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/Uniswap/UniswapERC20Token.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/xDaiBridge.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/xDaiBridge.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/SwapToken/xDaiBridge.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/xDaiBridge.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenActions/SwapTokenNativeProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenNativeProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenActions/SwapTokenNativeProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenNativeProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenActions/SwapTokenProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenActions/SwapTokenProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenActions/SwapTokenViaUrlProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenViaUrlProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenActions/SwapTokenViaUrlProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/SwapTokenViaUrlProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenActions/TokenActionsService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/TokenActionsService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenActions/TokenActionsService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenActions/TokenActionsService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/EventSource.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/EventSource.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/EventSource.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/EventSource.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/EventSourceForActivities.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/EventSourceForActivities.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/EventSourceForActivities.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/EventSourceForActivities.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/FetchTokenScriptFiles.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/FetchTokenScriptFiles.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/FetchTokenScriptFiles.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/FetchTokenScriptFiles.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/Activity.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/Activity.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/Activity.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/Activity.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/ActivityRowType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/ActivityRowType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/ActivityRowType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/ActivityRowType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttribute.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttribute.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttribute.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttribute.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeMapping.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeMapping.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeMapping.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeMapping.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeSyntax.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeSyntax.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeSyntax.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeSyntax.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeSyntaxValue.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeSyntaxValue.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeSyntaxValue.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeSyntaxValue.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeToJavaScriptConvertor.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeToJavaScriptConvertor.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeToJavaScriptConvertor.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeToJavaScriptConvertor.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeValueUsableAsFunctionArguments.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeValueUsableAsFunctionArguments.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeValueUsableAsFunctionArguments.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeValueUsableAsFunctionArguments.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeValues.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeValues.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetAttributeValues.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetAttributeValues.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionBackingStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionBackingStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionBackingStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionBackingStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionDiskBackingStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionDiskBackingStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionDiskBackingStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionDiskBackingStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionDiskBackingStoreWithOverrides.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionDiskBackingStoreWithOverrides.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionDiskBackingStoreWithOverrides.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionDiskBackingStoreWithOverrides.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionInMemoryBackingStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionInMemoryBackingStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionInMemoryBackingStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionInMemoryBackingStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetDefinitionStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetDefinitionStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetFunctionCall.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetFunctionCall.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetFunctionCall.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetFunctionCall.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetImplicitAttributes.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetImplicitAttributes.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetImplicitAttributes.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetImplicitAttributes.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetInternalValue.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetInternalValue.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/AssetInternalValue.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/AssetInternalValue.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/CallForAssetAttribute.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/CallForAssetAttribute.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/CallForAssetAttribute.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/CallForAssetAttribute.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/CallForAssetAttributeCoordinator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/CallForAssetAttributeCoordinator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/CallForAssetAttributeCoordinator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/CallForAssetAttributeCoordinator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/DirectoryContentsWatcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/DirectoryContentsWatcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/DirectoryContentsWatcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/DirectoryContentsWatcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/EventOrigin.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/EventOrigin.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/EventOrigin.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/EventOrigin.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/EventsActivityDataStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/EventsActivityDataStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/EventsActivityDataStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/EventsActivityDataStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/FunctionOrigin.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/FunctionOrigin.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/FunctionOrigin.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/FunctionOrigin.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/GeneralisedTime.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/GeneralisedTime.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/GeneralisedTime.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/GeneralisedTime.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/NonActivityEventsDataStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/NonActivityEventsDataStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/NonActivityEventsDataStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/NonActivityEventsDataStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/Origin.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/Origin.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/Origin.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/Origin.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/RPCServerOrAny.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/RPCServerOrAny.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/RPCServerOrAny.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/RPCServerOrAny.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/SolidityType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/SolidityType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/SolidityType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/SolidityType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenIdOrEvent.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenIdOrEvent.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenIdOrEvent.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenIdOrEvent.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenIdOrigin.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenIdOrigin.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenIdOrigin.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenIdOrigin.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenInterfaceType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenInterfaceType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenInterfaceType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenInterfaceType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScript.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScript.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScript.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScript.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptCard.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptCard.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptCard.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptCard.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptFileIndices.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptFileIndices.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptFileIndices.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptFileIndices.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptFilterParser.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptFilterParser.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptFilterParser.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptFilterParser.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptSelection.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptSelection.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptSelection.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptSelection.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptSignatureVerifier.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptSignatureVerifier.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptSignatureVerifier.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptSignatureVerifier.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptSupportable.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptSupportable.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptSupportable.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptSupportable.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptToken.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptToken.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/TokenScriptToken.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/TokenScriptToken.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/UserEntryOrigin.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/UserEntryOrigin.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/UserEntryOrigin.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/UserEntryOrigin.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/XMLHandler+XPaths.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/XMLHandler+XPaths.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/XMLHandler+XPaths.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/XMLHandler+XPaths.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/XMLHandler.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/XMLHandler.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/XMLHandler.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/XMLHandler.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/XmlContext.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/XmlContext.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/Models/XmlContext.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/XmlContext.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/SchemaCheckError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/SchemaCheckError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/TokenScriptClient/SchemaCheckError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/SchemaCheckError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/AlphaWalletTokensService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/AlphaWalletTokensService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/AlphaWalletTokensService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/AlphaWalletTokensService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/ClientSideTokenSourceProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/ClientSideTokenSourceProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/ClientSideTokenSourceProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/ClientSideTokenSourceProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/EthCurrencyHelper.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/EthCurrencyHelper.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/EthCurrencyHelper.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/EthCurrencyHelper.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/CachedERC1155ContractDictionary.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/CachedERC1155ContractDictionary.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/CachedERC1155ContractDictionary.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/CachedERC1155ContractDictionary.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/CallSmartContractFunction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/CallSmartContractFunction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/CallSmartContractFunction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/CallSmartContractFunction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/NonFungibleErc1155JsonBalanceFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/NonFungibleErc1155JsonBalanceFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/NonFungibleErc1155JsonBalanceFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/NonFungibleErc1155JsonBalanceFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/NonFungibleJsonBalanceFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/NonFungibleJsonBalanceFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/NonFungibleJsonBalanceFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/NonFungibleJsonBalanceFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/TokenAdaptor.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/TokenAdaptor.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/TokenAdaptor.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/TokenAdaptor.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/UiTweaks.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/UiTweaks.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Helpers/UiTweaks.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Helpers/UiTweaks.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/JSON/TokenGroupIdentifier.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/JSON/TokenGroupIdentifier.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/JSON/TokenGroupIdentifier.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/JSON/TokenGroupIdentifier.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Lists/SpamTokens.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Lists/SpamTokens.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Lists/SpamTokens.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Lists/SpamTokens.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/ContractDataDetector.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/ContractDataDetector.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/ContractDataDetector.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/ContractDataDetector.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/Erc1155BalanceFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/Erc1155BalanceFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/Erc1155BalanceFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/Erc1155BalanceFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/Erc1155TokenIdsFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/Erc1155TokenIdsFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/Erc1155TokenIdsFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/Erc1155TokenIdsFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetBlockTimestamp.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetBlockTimestamp.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetBlockTimestamp.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetBlockTimestamp.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetContractDecimals.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetContractDecimals.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetContractDecimals.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetContractDecimals.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetContractInteractions.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetContractInteractions.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetContractInteractions.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetContractInteractions.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetContractName.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetContractName.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetContractName.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetContractName.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetContractSymbol.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetContractSymbol.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetContractSymbol.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetContractSymbol.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetDASNameLookup.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetDASNameLookup.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetDASNameLookup.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetDASNameLookup.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetErc20Balance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetErc20Balance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetErc20Balance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetErc20Balance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetErc721Balance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetErc721Balance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetErc721Balance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetErc721Balance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetErc721ForTicketsBalance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetErc721ForTicketsBalance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetErc721ForTicketsBalance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetErc721ForTicketsBalance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetErc875Balance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetErc875Balance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetErc875Balance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetErc875Balance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetNativeCryptoCurrencyBalance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetNativeCryptoCurrencyBalance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetNativeCryptoCurrencyBalance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetNativeCryptoCurrencyBalance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetWalletName.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetWalletName.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/GetWalletName.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetWalletName.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/HistoryHelper.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/HistoryHelper.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/HistoryHelper.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/HistoryHelper.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsErc1155Contract.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsErc1155Contract.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsErc1155Contract.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsErc1155Contract.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsErc721Contract.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsErc721Contract.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsErc721Contract.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsErc721Contract.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsErc721ForTicketsContract.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsErc721ForTicketsContract.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsErc721ForTicketsContract.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsErc721ForTicketsContract.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsErc875Contract.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsErc875Contract.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsErc875Contract.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsErc875Contract.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsInterfaceSupported165.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsInterfaceSupported165.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/IsInterfaceSupported165.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/IsInterfaceSupported165.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/ScriptUri.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/ScriptUri.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Logic/ScriptUri.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/ScriptUri.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Models/NonFungibleContract.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Models/NonFungibleContract.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Models/NonFungibleContract.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Models/NonFungibleContract.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/PaymentFlowFromEip681UrlResolver.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/PaymentFlowFromEip681UrlResolver.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/PaymentFlowFromEip681UrlResolver.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/PaymentFlowFromEip681UrlResolver.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/PopularTokens/PopularTokensCollection.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/PopularTokens/PopularTokensCollection.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/PopularTokens/PopularTokensCollection.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/PopularTokens/PopularTokensCollection.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/PopularTokens/known_contract.json b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/PopularTokens/known_contract.json similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/PopularTokens/known_contract.json rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/PopularTokens/known_contract.json diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokenImageFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokenImageFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokenImageFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokenImageFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokenSourceProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokenSourceProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokenSourceProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokenSourceProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/AutoDetectTokensOperation.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/AutoDetectTokensOperation.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/AutoDetectTokensOperation.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/AutoDetectTokensOperation.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/AutoDetectTransactedTokensOperation.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/AutoDetectTransactedTokensOperation.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/AutoDetectTransactedTokensOperation.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/AutoDetectTransactedTokensOperation.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/ImportToken.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/ImportToken.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/ImportToken.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/ImportToken.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/TokenFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/TokenFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/TokenFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/TokenFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/TokensAutodetector.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/TokensAutodetector.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensAutodetector/TokensAutodetector.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensAutodetector/TokensAutodetector.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensFilter.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensFilter.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensFilter.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensFilter.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensProcessingPipeline.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensProcessingPipeline.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensProcessingPipeline.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensProcessingPipeline.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/TokensService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/TokensService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/AddressAndRPCServer.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/AddressAndRPCServer.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/AddressAndRPCServer.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/AddressAndRPCServer.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/ChartHistory.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/ChartHistory.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/ChartHistory.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/ChartHistory.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/DelegateContract.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/DelegateContract.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/DelegateContract.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/DelegateContract.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/DeletedContract.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/DeletedContract.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/DeletedContract.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/DeletedContract.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/ERCToken.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/ERCToken.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/ERCToken.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/ERCToken.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/EventActivity.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/EventActivity.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/EventActivity.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/EventActivity.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/EventInstance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/EventInstance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/EventInstance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/EventInstance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/EventInstanceValue.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/EventInstanceValue.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/EventInstanceValue.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/EventInstanceValue.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/HiddenContract.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/HiddenContract.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/HiddenContract.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/HiddenContract.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/NonFungibleFromTokenUri.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/NonFungibleFromTokenUri.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/NonFungibleFromTokenUri.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/NonFungibleFromTokenUri.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/Token.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/Token.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/Token.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/Token.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenBalance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenBalance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenBalance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenBalance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenHolder.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenHolder.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenHolder.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenHolder.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenInfo.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenInfo.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenInfo.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenInfo.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenInfoObject.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenInfoObject.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenInfoObject.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenInfoObject.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenInstanceAction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenInstanceAction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenInstanceAction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenInstanceAction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenObject.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenObject.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenObject.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenObject.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenViewModel.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenViewModel.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokenViewModel.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokenViewModel.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokensDataStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokensDataStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/TokensDataStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/TokensDataStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/WalletFilter.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/WalletFilter.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/WalletFilter.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/WalletFilter.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/Web3Error.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/Web3Error.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Tokens/Types/Web3Error.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Types/Web3Error.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CombineTimer.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CombineTimer.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CombineTimer.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CombineTimer.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/Covalent.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/Covalent.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/Covalent.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/Covalent.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CovalentApiUrlProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CovalentApiUrlProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CovalentApiUrlProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CovalentApiUrlProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CovalentNetworkProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CovalentNetworkProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CovalentNetworkProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CovalentNetworkProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CovalentToNativeTransactionMapper.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CovalentToNativeTransactionMapper.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CovalentToNativeTransactionMapper.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CovalentToNativeTransactionMapper.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CovalentTransactionProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CovalentTransactionProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/CovalentTransactionProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/CovalentTransactionProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionSchedulerProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionSchedulerProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionSchedulerProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/NewlyAddedTransaction/NewlyAddedTransactionSchedulerProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionSchedulerProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionSchedulerProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionSchedulerProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/OldestTransaction/OldestTransactionSchedulerProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionSchedulerProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionSchedulerProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionSchedulerProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/PendingTransaction/PendingTransactionSchedulerProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/Scheduler.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/Scheduler.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Covalent/TransactionProviders/Scheduler.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Covalent/TransactionProviders/Scheduler.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/EtherscanSingleChainTransactionProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/EtherscanSingleChainTransactionProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/EtherscanSingleChainTransactionProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/EtherscanSingleChainTransactionProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/SingleChainTransactionProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/SingleChainTransactionProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/SingleChainTransactionProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/SingleChainTransactionProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Storage/Transaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Storage/Transaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Storage/Transaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Storage/Transaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Storage/TransactionsStorage.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Storage/TransactionsStorage.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Storage/TransactionsStorage.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Storage/TransactionsStorage.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/TokensFromTransactionsFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/TokensFromTransactionsFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/TokensFromTransactionsFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/TokensFromTransactionsFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/TransactionsService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/TransactionsService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/TransactionsService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/TransactionsService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/Erc721TokenIdsFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/Erc721TokenIdsFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/Erc721TokenIdsFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/Erc721TokenIdsFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/LocalizedOperationObject.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/LocalizedOperationObject.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/LocalizedOperationObject.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/LocalizedOperationObject.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionDirection.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionDirection.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionDirection.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionDirection.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionItemState.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionItemState.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionItemState.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionItemState.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionRow.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionRow.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionRow.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionRow.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionValue.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionValue.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionValue.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionValue.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionsFilterStrategy.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionsFilterStrategy.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionsFilterStrategy.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionsFilterStrategy.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionsTracker.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionsTracker.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transactions/Types/TransactionsTracker.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transactions/Types/TransactionsTracker.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/SendTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/SendTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/SendTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/SendTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/TransactionConfigurator.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/TransactionConfigurator.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/TransactionConfigurator.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/TransactionConfigurator.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/ConfigureTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/ConfigureTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/ConfigureTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/ConfigureTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/ConfigureTransactionError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/ConfigureTransactionError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/ConfigureTransactionError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/ConfigureTransactionError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/ConfirmResult.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/ConfirmResult.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/ConfirmResult.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/ConfirmResult.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/CurrencyRate+Fee.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/CurrencyRate+Fee.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/CurrencyRate+Fee.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/CurrencyRate+Fee.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/DAppRequster.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/DAppRequster.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/DAppRequster.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/DAppRequster.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/FungiblesTransactionAmount.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/FungiblesTransactionAmount.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/FungiblesTransactionAmount.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/FungiblesTransactionAmount.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasFeeWarning.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasFeeWarning.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasFeeWarning.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasFeeWarning.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasLimitConfiguration.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasLimitConfiguration.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasLimitConfiguration.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasLimitConfiguration.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasLimitWarning.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasLimitWarning.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasLimitWarning.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasLimitWarning.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasPriceConfiguration.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasPriceConfiguration.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasPriceConfiguration.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasPriceConfiguration.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasPriceWarning.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasPriceWarning.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GasPriceWarning.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GasPriceWarning.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GetGasLimit.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GetGasLimit.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/GetGasLimit.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/GetGasLimit.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/PaymentFlow.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/PaymentFlow.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/PaymentFlow.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/PaymentFlow.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/RecipientResolver.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/RecipientResolver.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/RecipientResolver.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/RecipientResolver.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/SendTransactionError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/SendTransactionError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/SendTransactionError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/SendTransactionError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/SentTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/SentTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/SentTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/SentTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/TransactionConfiguration.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/TransactionConfiguration.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/TransactionConfiguration.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/TransactionConfiguration.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/TransactionConfigurations.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/TransactionConfigurations.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/TransactionConfigurations.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/TransactionConfigurations.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/TransactionType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/TransactionType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/TransactionType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/TransactionType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/UnconfirmedTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/UnconfirmedTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Transfer/Types/UnconfirmedTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/UnconfirmedTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/AlphaWalletAddress.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/AlphaWalletAddress.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/AlphaWalletAddress.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/AlphaWalletAddress.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/AppErrors.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/AppErrors.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/AppErrors.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/AppErrors.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/AppTracker.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/AppTracker.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/AppTracker.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/AppTracker.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Balance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Balance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Balance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Balance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/BalanceViewModel.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/BalanceViewModel.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/BalanceViewModel.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/BalanceViewModel.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ChangeSet.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ChangeSet.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ChangeSet.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ChangeSet.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ConnectionUrl.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ConnectionUrl.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ConnectionUrl.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ConnectionUrl.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/DeepLink.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/DeepLink.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/DeepLink.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/DeepLink.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/DevelopmentForcedError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/DevelopmentForcedError.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/DevelopmentForcedError.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/DevelopmentForcedError.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Erc20BalanceViewModel.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Erc20BalanceViewModel.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Erc20BalanceViewModel.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Erc20BalanceViewModel.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Ether.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Ether.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Ether.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Ether.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/EthereumUnit.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/EthereumUnit.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/EthereumUnit.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/EthereumUnit.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ImageOrWebImageUrl.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ImageOrWebImageUrl.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ImageOrWebImageUrl.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ImageOrWebImageUrl.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/NFTBalanceViewModel.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/NFTBalanceViewModel.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/NFTBalanceViewModel.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/NFTBalanceViewModel.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/NativecryptoBalanceViewModel.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/NativecryptoBalanceViewModel.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/NativecryptoBalanceViewModel.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/NativecryptoBalanceViewModel.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/PendingTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/PendingTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/PendingTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/PendingTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RPCServerOrAuto.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RPCServerOrAuto.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RPCServerOrAuto.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RPCServerOrAuto.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RateLimiter.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RateLimiter.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RateLimiter.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RateLimiter.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RealmConfiguration.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RealmConfiguration.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RealmConfiguration.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RealmConfiguration.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RealmStore.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RealmStore.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RealmStore.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RealmStore.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Requester.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Requester.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Requester.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Requester.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RestartTaskQueue.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RestartTaskQueue.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RestartTaskQueue.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RestartTaskQueue.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RunLoopThread.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RunLoopThread.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/RunLoopThread.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RunLoopThread.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ServerDictionary.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ServerDictionary.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ServerDictionary.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ServerDictionary.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Session.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Session.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/Session.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/Session.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/SessionsProvider.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/SessionsProvider.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/SessionsProvider.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/SessionsProvider.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/SortTokensParam.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/SortTokensParam.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/SortTokensParam.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/SortTokensParam.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ThreadSafeDictionary.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ThreadSafeDictionary.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/ThreadSafeDictionary.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/ThreadSafeDictionary.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/TokenProviderType.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/TokenProviderType.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/TokenProviderType.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/TokenProviderType.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/TokenUpdate.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/TokenUpdate.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/TokenUpdate.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/TokenUpdate.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/UnsignedTransaction.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/UnsignedTransaction.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/UnsignedTransaction.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/UnsignedTransaction.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/WalletBalance.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/WalletBalance.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/WalletBalance.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/WalletBalance.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/WalletDependencyContainer.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/WalletDependencyContainer.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/WalletDependencyContainer.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/WalletDependencyContainer.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/WalletSummary.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/WalletSummary.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/WalletSummary.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/WalletSummary.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/WeakRef.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/WeakRef.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/WeakRef.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/WeakRef.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/eip155URLDecoder.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/eip155URLDecoder.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/Types/eip155URLDecoder.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/eip155URLDecoder.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/UniversalLink/UniversalLinkInPasteboardService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/UniversalLink/UniversalLinkInPasteboardService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/UniversalLink/UniversalLinkInPasteboardService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/UniversalLink/UniversalLinkInPasteboardService.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/UniversalLink/UrlSchemeResolver.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/UniversalLink/UrlSchemeResolver.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/UniversalLink/UrlSchemeResolver.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/UniversalLink/UrlSchemeResolver.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/WalletBalance/TokenBalanceFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/WalletBalance/TokenBalanceFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/WalletBalance/TokenBalanceFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/WalletBalance/TokenBalanceFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/WalletBalance/WalletBalanceFetcher.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/WalletBalance/WalletBalanceFetcher.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/WalletBalance/WalletBalanceFetcher.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/WalletBalance/WalletBalanceFetcher.swift diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/WalletBalance/WalletBalanceService.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/WalletBalance/WalletBalanceService.swift similarity index 100% rename from modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/WalletBalance/WalletBalanceService.swift rename to modules/AlphaWalletFoundation/AlphaWalletFoundation/WalletBalance/WalletBalanceService.swift