diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id
index 8e3e3da7e..c4f58572f 100644
--- a/ios/Flutter/.last_build_id
+++ b/ios/Flutter/.last_build_id
@@ -1 +1 @@
-a2dce69f54a78f5b00e19850e4b2d402
\ No newline at end of file
+bc336703210c48e30d7216fac3fe1c0f
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 63e247dc4..4343ce3d9 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -47,6 +47,8 @@ PODS:
     - Flutter
   - path_provider_macos (0.0.1):
     - Flutter
+  - path_provider_windows (0.0.1):
+    - Flutter
   - Reachability (3.2)
   - share (0.0.1):
     - Flutter
@@ -67,6 +69,8 @@ PODS:
     - Flutter
   - url_launcher_web (0.0.1):
     - Flutter
+  - url_launcher_windows (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
   - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
@@ -84,6 +88,7 @@ DEPENDENCIES:
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
   - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
   - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
+  - path_provider_windows (from `.symlinks/plugins/path_provider_windows/ios`)
   - share (from `.symlinks/plugins/share/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
   - shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
@@ -93,6 +98,7 @@ DEPENDENCIES:
   - url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`)
   - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
   - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
+  - url_launcher_windows (from `.symlinks/plugins/url_launcher_windows/ios`)
 
 SPEC REPOS:
   trunk:
@@ -131,6 +137,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_linux/ios"
   path_provider_macos:
     :path: ".symlinks/plugins/path_provider_macos/ios"
+  path_provider_windows:
+    :path: ".symlinks/plugins/path_provider_windows/ios"
   share:
     :path: ".symlinks/plugins/share/ios"
   shared_preferences:
@@ -149,6 +157,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_macos/ios"
   url_launcher_web:
     :path: ".symlinks/plugins/url_launcher_web/ios"
+  url_launcher_windows:
+    :path: ".symlinks/plugins/url_launcher_windows/ios"
 
 SPEC CHECKSUMS:
   barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
@@ -167,6 +177,7 @@ SPEC CHECKSUMS:
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
   path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
   path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
+  path_provider_windows: a2b81600c677ac1959367280991971cb9a1edb3b
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   share: 0b2c3e82132f5888bccca3351c504d0003b3b410
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
@@ -178,6 +189,7 @@ SPEC CHECKSUMS:
   url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
   url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
   url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
+  url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5
 
 PODFILE CHECKSUM: c34e2287a9ccaa606aeceab922830efb9a6ff69a
 
diff --git a/lib/bitcoin/bitcoin_amount_format.dart b/lib/bitcoin/bitcoin_amount_format.dart
index a1ff8cecf..75db6c314 100644
--- a/lib/bitcoin/bitcoin_amount_format.dart
+++ b/lib/bitcoin/bitcoin_amount_format.dart
@@ -1,5 +1,5 @@
 import 'package:intl/intl.dart';
-import 'package:cake_wallet/src/domain/common/crypto_amount_format.dart';
+import 'package:cake_wallet/entities/crypto_amount_format.dart';
 
 const bitcoinAmountLength = 8;
 const bitcoinAmountDivider = 100000000;
@@ -11,3 +11,6 @@ String bitcoinAmountToString({int amount}) =>
     bitcoinAmountFormat.format(cryptoAmountToDouble(amount: amount, divider: bitcoinAmountDivider));
 
 double bitcoinAmountToDouble({int amount}) => cryptoAmountToDouble(amount: amount, divider: bitcoinAmountDivider);
+
+int doubleToBitcoinAmount(double amount) =>
+    (amount * bitcoinAmountDivider).toInt();
\ No newline at end of file
diff --git a/lib/bitcoin/bitcoin_balance.dart b/lib/bitcoin/bitcoin_balance.dart
index a1bc5c844..6aefe28f4 100644
--- a/lib/bitcoin/bitcoin_balance.dart
+++ b/lib/bitcoin/bitcoin_balance.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/common/balance.dart';
+import 'package:cake_wallet/entities/balance.dart';
 
 class BitcoinBalance extends Balance {
   const BitcoinBalance({@required this.confirmed, @required this.unconfirmed}) : super();
diff --git a/lib/bitcoin/bitcoin_transaction_credentials.dart b/lib/bitcoin/bitcoin_transaction_credentials.dart
index 874da1263..9e64634b3 100644
--- a/lib/bitcoin/bitcoin_transaction_credentials.dart
+++ b/lib/bitcoin/bitcoin_transaction_credentials.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
 
 class BitcoinTransactionCredentials {
   BitcoinTransactionCredentials(this.address, this.amount, this.priority);
diff --git a/lib/bitcoin/bitcoin_transaction_history.dart b/lib/bitcoin/bitcoin_transaction_history.dart
index 81ed01fe7..c687c0ba4 100644
--- a/lib/bitcoin/bitcoin_transaction_history.dart
+++ b/lib/bitcoin/bitcoin_transaction_history.dart
@@ -58,16 +58,7 @@ abstract class BitcoinTransactionHistoryBase
     final histories =
         wallet.scriptHashes.map((scriptHash) => eclient.getHistory(scriptHash));
     final _historiesWithDetails = await Future.wait(histories)
-        .then((histories) => histories
-//            .map((h) => h.where((tx) {
-//                  final height = tx['height'] as int ?? 0;
-//                  // FIXME: Filter only needed transactions
-//                  final _tx = get(tx['tx_hash'] as String);
-//
-//                  return height == 0 || height > _height;
-//                }))
-            .expand((i) => i)
-            .toList())
+        .then((histories) => histories.expand((i) => i).toList())
         .then((histories) => histories.map((tx) => fetchTransactionInfo(
             hash: tx['tx_hash'] as String, height: tx['height'] as int)));
     final historiesWithDetails = await Future.wait(_historiesWithDetails);
diff --git a/lib/bitcoin/bitcoin_transaction_info.dart b/lib/bitcoin/bitcoin_transaction_info.dart
index 4198ca9e2..29cb8521e 100644
--- a/lib/bitcoin/bitcoin_transaction_info.dart
+++ b/lib/bitcoin/bitcoin_transaction_info.dart
@@ -1,22 +1,22 @@
 import 'package:flutter/foundation.dart';
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
-import 'package:cake_wallet/bitcoin/bitcoin_address_record.dart';
 import 'package:bitcoin_flutter/src/payments/index.dart' show PaymentData;
+import 'package:cake_wallet/bitcoin/bitcoin_address_record.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
-import 'package:cake_wallet/src/domain/common/format_amount.dart';
+import 'package:cake_wallet/entities/transaction_direction.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
+import 'package:cake_wallet/entities/format_amount.dart';
 
 class BitcoinTransactionInfo extends TransactionInfo {
   BitcoinTransactionInfo(
-      {@required this.id,
+      {@required String id,
       @required int height,
       @required int amount,
       @required TransactionDirection direction,
       @required bool isPending,
       @required DateTime date,
       @required int confirmations}) {
+    this.id = id;
     this.height = height;
     this.amount = amount;
     this.direction = direction;
@@ -97,7 +97,6 @@ class BitcoinTransactionInfo extends TransactionInfo {
         ? DateTime.fromMillisecondsSinceEpoch(timestamp * 1000)
         : DateTime.now();
 
-    // FIXME: Get transaction is pending
     return BitcoinTransactionInfo(
         id: tx.getId(),
         height: height,
@@ -119,8 +118,6 @@ class BitcoinTransactionInfo extends TransactionInfo {
         confirmations: data['confirmations'] as int);
   }
 
-  final String id;
-
   String _fiatAmount;
 
   @override
diff --git a/lib/bitcoin/bitcoin_wallet.dart b/lib/bitcoin/bitcoin_wallet.dart
index fe6cbf184..e43c0aeaa 100644
--- a/lib/bitcoin/bitcoin_wallet.dart
+++ b/lib/bitcoin/bitcoin_wallet.dart
@@ -14,15 +14,15 @@ import 'package:cake_wallet/bitcoin/electrum.dart';
 import 'package:cake_wallet/bitcoin/pending_bitcoin_transaction.dart';
 import 'package:cake_wallet/bitcoin/script_hash.dart';
 import 'package:cake_wallet/bitcoin/utils.dart';
-import 'package:cake_wallet/src/domain/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
+import 'package:cake_wallet/bitcoin/bitcoin_amount_format.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_history.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_address_record.dart';
 import 'package:cake_wallet/bitcoin/file.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_balance.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
+import 'package:cake_wallet/entities/node.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
 
 part 'bitcoin_wallet.g.dart';
@@ -316,6 +316,11 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
   bitcoin.ECPair keyPairFor({@required int index}) =>
       generateKeyPair(hd: hd, index: index);
 
+  @override
+  Future<void> rescan({int height}) async {
+    // FIXME: Unimplemented
+  }
+
   void _subscribeForUpdates() {
     scriptHashes.forEach((sh) async {
       await _scripthashesUpdateSubject[sh]?.close();
diff --git a/lib/bitcoin/bitcoin_wallet_service.dart b/lib/bitcoin/bitcoin_wallet_service.dart
index cb2d241fb..2e9a1c305 100644
--- a/lib/bitcoin/bitcoin_wallet_service.dart
+++ b/lib/bitcoin/bitcoin_wallet_service.dart
@@ -4,8 +4,8 @@ import 'package:cake_wallet/bitcoin/file.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_creation_credentials.dart';
 import 'package:cake_wallet/core/wallet_service.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet.dart';
-import 'package:cake_wallet/src/domain/common/pathForWallet.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/pathForWallet.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 class BitcoinWalletService extends WalletService<
     BitcoinNewWalletCredentials,
diff --git a/lib/bitcoin/electrum.dart b/lib/bitcoin/electrum.dart
index 69d1c332f..5348959e7 100644
--- a/lib/bitcoin/electrum.dart
+++ b/lib/bitcoin/electrum.dart
@@ -40,6 +40,7 @@ class ElectrumClient {
         _tasks = {};
 
   static const connectionTimeout = Duration(seconds: 5);
+  static const aliveTimerDuration = Duration(seconds: 2);
 
   bool get isConnected => _isConnected;
   Socket socket;
@@ -97,8 +98,7 @@ class ElectrumClient {
 
   void keepAlive() {
     _aliveTimer?.cancel();
-    // FIXME: Unnamed constant.
-    _aliveTimer = Timer.periodic(Duration(seconds: 2), (_) async => ping());
+    _aliveTimer = Timer.periodic(aliveTimerDuration, (_) async => ping());
   }
 
   Future<void> ping() async {
diff --git a/lib/bitcoin/pending_bitcoin_transaction.dart b/lib/bitcoin/pending_bitcoin_transaction.dart
index 64b317169..d2c018a35 100644
--- a/lib/bitcoin/pending_bitcoin_transaction.dart
+++ b/lib/bitcoin/pending_bitcoin_transaction.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/bitcoin/bitcoin_amount_format.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
+import 'package:cake_wallet/entities/transaction_direction.dart';
 import 'package:flutter/foundation.dart';
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
 import 'package:cake_wallet/core/pending_transaction.dart';
diff --git a/lib/core/address_label_validator.dart b/lib/core/address_label_validator.dart
index 903b2e50e..7d8f8c631 100644
--- a/lib/core/address_label_validator.dart
+++ b/lib/core/address_label_validator.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/core/validator.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 class AddressLabelValidator extends TextValidator {
   AddressLabelValidator({WalletType type})
diff --git a/lib/core/address_validator.dart b/lib/core/address_validator.dart
index 26e239f6c..1ee9e72db 100644
--- a/lib/core/address_validator.dart
+++ b/lib/core/address_validator.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/validator.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 
 class AddressValidator extends TextValidator {
   AddressValidator({@required CryptoCurrency type})
diff --git a/lib/core/amount.dart b/lib/core/amount.dart
new file mode 100644
index 000000000..62e59db18
--- /dev/null
+++ b/lib/core/amount.dart
@@ -0,0 +1,37 @@
+abstract class Amount {
+  Amount(this.value);
+
+  int value;
+
+  int minorDigits;
+
+  String code;
+
+  String formatted();
+}
+
+class MoneroAmount extends Amount {
+  MoneroAmount(int value) : super(value) {
+    minorDigits = 12;
+    code = 'XMR';
+  }
+
+  // const moneroAmountLength = 12;
+  // const moneroAmountDivider = 1000000000000;
+  // final moneroAmountFormat = NumberFormat()
+  //   ..maximumFractionDigits = moneroAmountLength
+  //   ..minimumFractionDigits = 1;
+
+  // String moneroAmountToString({int amount}) =>
+  //     moneroAmountFormat.format(cryptoAmountToDouble(amount: amount, divider: moneroAmountDivider));
+
+  // double moneroAmountToDouble({int amount}) => cryptoAmountToDouble(amount: amount, divider: moneroAmountDivider);
+
+  // int moneroParseAmount({String amount}) => moneroAmountFormat.parse(amount).toInt();
+
+  @override
+  String formatted() {
+    // TODO: implement formatted
+    throw UnimplementedError();
+  }
+}
diff --git a/lib/core/amount_converter.dart b/lib/core/amount_converter.dart
new file mode 100644
index 000000000..7ef4ed442
--- /dev/null
+++ b/lib/core/amount_converter.dart
@@ -0,0 +1,92 @@
+import 'package:intl/intl.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+
+class AmountConverter {
+  static const _moneroAmountLength = 12;
+  static const _moneroAmountDivider = 1000000000000;
+  static const _litecoinAmountDivider = 100000000;
+  static const _ethereumAmountDivider = 1000000000000000000;
+  static const _dashAmountDivider = 100000000;
+  static const _bitcoinCashAmountDivider = 100000000;
+  static const _bitcoinAmountDivider = 100000000;
+  static const _bitcoinAmountLength = 8;
+  static final _bitcoinAmountFormat = NumberFormat()
+    ..maximumFractionDigits = _bitcoinAmountLength
+    ..minimumFractionDigits = 1;
+  static final _moneroAmountFormat = NumberFormat()
+    ..maximumFractionDigits = _moneroAmountLength
+    ..minimumFractionDigits = 1;
+
+  static double amountIntToDouble(CryptoCurrency cryptoCurrency, int amount) {
+    switch (cryptoCurrency) {
+      case CryptoCurrency.xmr:
+        return _moneroAmountToDouble(amount);
+      case CryptoCurrency.btc:
+        return _bitcoinAmountToDouble(amount);
+      case CryptoCurrency.bch:
+        return _bitcoinCashAmountToDouble(amount);
+      case CryptoCurrency.dash:
+        return _dashAmountToDouble(amount);
+      case CryptoCurrency.eth:
+        return _ethereumAmountToDouble(amount);
+      case CryptoCurrency.ltc:
+        return _litecoinAmountToDouble(amount);
+      default:
+        return null;
+    }
+  }
+
+  static int amountStringToInt(CryptoCurrency cryptoCurrency, String amount) {
+    switch (cryptoCurrency) {
+      case CryptoCurrency.xmr:
+        return _moneroParseAmount(amount);
+      default:
+        return null;
+    }
+  }
+
+  static String amountIntToString(CryptoCurrency cryptoCurrency, int amount) {
+    switch (cryptoCurrency) {
+      case CryptoCurrency.xmr:
+        return _moneroAmountToString(amount);
+      case CryptoCurrency.btc:
+        return _bitcoinAmountToString(amount);
+      default:
+        return null;
+    }
+  }
+
+  static double cryptoAmountToDouble({num amount, num divider}) =>
+      amount / divider;
+
+  static String _moneroAmountToString(int amount) => _moneroAmountFormat.format(
+      cryptoAmountToDouble(amount: amount, divider: _moneroAmountDivider));
+
+  static double _moneroAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _moneroAmountDivider);
+
+  static int _moneroParseAmount(String amount) =>
+      _moneroAmountFormat.parse(amount).toInt();
+
+  static String _bitcoinAmountToString(int amount) =>
+      _bitcoinAmountFormat.format(
+          cryptoAmountToDouble(amount: amount, divider: _bitcoinAmountDivider));
+
+  static double _bitcoinAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _bitcoinAmountDivider);
+
+  static int _doubleToBitcoinAmount(double amount) =>
+      (amount * _bitcoinAmountDivider).toInt();
+
+  static double _bitcoinCashAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _bitcoinCashAmountDivider);
+
+  static double _dashAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _dashAmountDivider);
+
+  static double _ethereumAmountToDouble(num amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _ethereumAmountDivider);
+
+  static double _litecoinAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _litecoinAmountDivider);
+}
diff --git a/lib/core/amount_validator.dart b/lib/core/amount_validator.dart
index cee4fe8e1..abf55b6b7 100644
--- a/lib/core/amount_validator.dart
+++ b/lib/core/amount_validator.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/core/validator.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 class AmountValidator extends TextValidator {
   AmountValidator({WalletType type, bool isAutovalidate = false})
diff --git a/lib/core/auth_service.dart b/lib/core/auth_service.dart
index 557800fd6..f2c07d265 100644
--- a/lib/core/auth_service.dart
+++ b/lib/core/auth_service.dart
@@ -1,8 +1,9 @@
 import 'package:mobx/mobx.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/common/secret_store_key.dart';
-import 'package:cake_wallet/src/domain/common/encrypt.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/entities/secret_store_key.dart';
+import 'package:cake_wallet/entities/encrypt.dart';
 
 class AuthService with Store {
   AuthService({this.secureStorage, this.sharedPreferences});
@@ -18,7 +19,8 @@ class AuthService with Store {
 
   Future<bool> canAuthenticate() async {
     final key = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
-    final walletName = sharedPreferences.getString('current_wallet_name') ?? '';
+    final walletName =
+        sharedPreferences.getString(PreferencesKey.currentWalletName) ?? '';
     var password = '';
 
     try {
diff --git a/lib/core/contact_service.dart b/lib/core/contact_service.dart
index 1141a1d06..c7027fa8f 100644
--- a/lib/core/contact_service.dart
+++ b/lib/core/contact_service.dart
@@ -1,6 +1,6 @@
 import 'package:hive/hive.dart';
 import 'package:cake_wallet/store/contact_list_store.dart';
-import 'package:cake_wallet/src/domain/common/contact.dart';
+import 'package:cake_wallet/entities/contact.dart';
 
 class ContactService {
   ContactService(this.contactSource, this.contactListStore) {
diff --git a/lib/core/execution_state.dart b/lib/core/execution_state.dart
new file mode 100644
index 000000000..d4e3faeec
--- /dev/null
+++ b/lib/core/execution_state.dart
@@ -0,0 +1,13 @@
+abstract class ExecutionState {}
+
+class InitialExecutionState extends ExecutionState {}
+
+class IsExecutingState extends ExecutionState {}
+
+class ExecutedSuccessfullyState extends ExecutionState {}
+
+class FailureState extends ExecutionState {
+  FailureState(this.error);
+
+  final String error;
+}
\ No newline at end of file
diff --git a/lib/src/domain/common/fetch_price.dart b/lib/core/fiat_conversion_service.dart
similarity index 53%
rename from lib/src/domain/common/fetch_price.dart
rename to lib/core/fiat_conversion_service.dart
index 36f996f7e..a6d72497e 100644
--- a/lib/src/domain/common/fetch_price.dart
+++ b/lib/core/fiat_conversion_service.dart
@@ -1,13 +1,16 @@
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'dart:convert';
+import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/currency_formatter.dart';
+import 'package:cake_wallet/entities/currency_formatter.dart';
 
 const fiatApiAuthority = 'fiat-api.cakewallet.com';
 const fiatApiPath = '/v1/rates';
 
-Future<double> fetchPriceFor({CryptoCurrency crypto, FiatCurrency fiat}) async {
+Future<double> _fetchPrice(Map<String, dynamic> args) async {
+  final crypto = args['crypto'] as CryptoCurrency;
+  final fiat = args['fiat'] as FiatCurrency;
   double price = 0.0;
 
   try {
@@ -35,3 +38,12 @@ Future<double> fetchPriceFor({CryptoCurrency crypto, FiatCurrency fiat}) async {
     return price;
   }
 }
+
+Future<double> _fetchPriceAsync(
+        CryptoCurrency crypto, FiatCurrency fiat) async =>
+    compute(_fetchPrice, {'fiat': fiat, 'crypto': crypto});
+
+class FiatConversionService {
+  static Future<double> fetchPrice(CryptoCurrency crypto, FiatCurrency fiat) async =>
+      await _fetchPriceAsync(crypto, fiat);
+}
diff --git a/lib/core/generate_wallet_password.dart b/lib/core/generate_wallet_password.dart
index ea5b80d23..abf2e6dac 100644
--- a/lib/core/generate_wallet_password.dart
+++ b/lib/core/generate_wallet_password.dart
@@ -1,6 +1,6 @@
 import 'package:uuid/uuid.dart';
 import 'package:cake_wallet/bitcoin/key.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 String generateWalletPassword(WalletType type) {
   switch (type) {
diff --git a/lib/core/key_service.dart b/lib/core/key_service.dart
index 85185be72..eafca2b0a 100644
--- a/lib/core/key_service.dart
+++ b/lib/core/key_service.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:cake_wallet/src/domain/common/secret_store_key.dart';
-import 'package:cake_wallet/src/domain/common/encrypt.dart';
+import 'package:cake_wallet/entities/secret_store_key.dart';
+import 'package:cake_wallet/entities/encrypt.dart';
 
 class KeyService {
   KeyService(this._secureStorage);
diff --git a/lib/core/mnemonic_length.dart b/lib/core/mnemonic_length.dart
index 84100d8a7..8adf5c438 100644
--- a/lib/core/mnemonic_length.dart
+++ b/lib/core/mnemonic_length.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 const bitcoinMnemonicLength = 12;
 const moneroMnemonicLength = 25;
diff --git a/lib/core/monero_account_label_validator.dart b/lib/core/monero_account_label_validator.dart
index 9d06a437c..dcbac668f 100644
--- a/lib/core/monero_account_label_validator.dart
+++ b/lib/core/monero_account_label_validator.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/validator.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 
 class MoneroLabelValidator extends TextValidator {
   MoneroLabelValidator({@required CryptoCurrency type})
diff --git a/lib/core/seed_validator.dart b/lib/core/seed_validator.dart
index 54b1ffea7..36a06cb03 100644
--- a/lib/core/seed_validator.dart
+++ b/lib/core/seed_validator.dart
@@ -1,15 +1,16 @@
 import 'package:bip39/src/wordlists/english.dart' as bitcoin_english;
 import 'package:cake_wallet/core/validator.dart';
-import 'package:cake_wallet/src/domain/common/mnemonic_item.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/chinese_simplified.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/dutch.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/english.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/german.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/japanese.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/portuguese.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/russian.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/spanish.dart';
+import 'package:cake_wallet/entities/mnemonic_item.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/monero/mnemonics/chinese_simplified.dart';
+import 'package:cake_wallet/monero/mnemonics/dutch.dart';
+import 'package:cake_wallet/monero/mnemonics/english.dart';
+import 'package:cake_wallet/monero/mnemonics/german.dart';
+import 'package:cake_wallet/monero/mnemonics/japanese.dart';
+import 'package:cake_wallet/monero/mnemonics/portuguese.dart';
+import 'package:cake_wallet/monero/mnemonics/russian.dart';
+import 'package:cake_wallet/monero/mnemonics/spanish.dart';
+import 'package:cake_wallet/utils/language_list.dart';
 
 class SeedValidator extends Validator<MnemonicItem> {
   SeedValidator({this.type, this.language})
@@ -31,31 +32,29 @@ class SeedValidator extends Validator<MnemonicItem> {
   }
 
   static List<String> getMoneroWordList(String language) {
-    // FIXME: Unnamed constants; Need to be sure that string are in same case;
-
     switch (language) {
-      case 'English':
+      case LanguageList.english:
         return EnglishMnemonics.words;
         break;
-      case 'Chinese (simplified)':
+      case LanguageList.chineseSimplified:
         return ChineseSimplifiedMnemonics.words;
         break;
-      case 'Dutch':
+      case LanguageList.dutch:
         return DutchMnemonics.words;
         break;
-      case 'German':
+      case LanguageList.german:
         return GermanMnemonics.words;
         break;
-      case 'Japanese':
+      case LanguageList.japanese:
         return JapaneseMnemonics.words;
         break;
-      case 'Portuguese':
+      case LanguageList.portuguese:
         return PortugueseMnemonics.words;
         break;
-      case 'Russian':
+      case LanguageList.russian:
         return RussianMnemonics.words;
         break;
-      case 'Spanish':
+      case LanguageList.spanish:
         return SpanishMnemonics.words;
         break;
       default:
@@ -64,7 +63,7 @@ class SeedValidator extends Validator<MnemonicItem> {
   }
 
   static List<String> getBitcoinWordList(String language) {
-    assert(language.toLowerCase() == 'english');
+    assert(language.toLowerCase() == LanguageList.english.toLowerCase());
     return bitcoin_english.WORDLIST;
   }
 
diff --git a/lib/core/transaction_history.dart b/lib/core/transaction_history.dart
index dd2c5a0f2..6fa5bd228 100644
--- a/lib/core/transaction_history.dart
+++ b/lib/core/transaction_history.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
 
 abstract class TransactionHistoryBase<TransactionType extends TransactionInfo> {
   TransactionHistoryBase() : _isUpdating = false;
diff --git a/lib/core/wallet_base.dart b/lib/core/wallet_base.dart
index b5f8e27cc..8eea39dca 100644
--- a/lib/core/wallet_base.dart
+++ b/lib/core/wallet_base.dart
@@ -1,24 +1,13 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 import 'package:cake_wallet/core/pending_transaction.dart';
 import 'package:cake_wallet/core/transaction_history.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-
-// FIXME: Move me.
-CryptoCurrency currencyForWalletType(WalletType type) {
-  switch (type) {
-    case WalletType.bitcoin:
-      return CryptoCurrency.btc;
-    case WalletType.monero:
-      return CryptoCurrency.xmr;
-    default:
-      return null;
-  }
-}
+import 'package:cake_wallet/entities/currency_for_wallet_type.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 abstract class WalletBase<BalaceType> {
   WalletBase(this.walletInfo);
@@ -61,4 +50,6 @@ abstract class WalletBase<BalaceType> {
   double calculateEstimatedFee(TransactionPriority priority);
 
   Future<void> save();
+
+  Future<void> rescan({int height});
 }
diff --git a/lib/core/wallet_creation_service.dart b/lib/core/wallet_creation_service.dart
index ce14fa1e2..fe3062d36 100644
--- a/lib/core/wallet_creation_service.dart
+++ b/lib/core/wallet_creation_service.dart
@@ -3,18 +3,15 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:cake_wallet/core/key_service.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/core/generate_wallet_password.dart';
-import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/core/wallet_credentials.dart';
-import 'package:cake_wallet/bitcoin/bitcoin_wallet_service.dart';
-import 'package:cake_wallet/monero/monero_wallet_service.dart';
 import 'package:cake_wallet/core/wallet_service.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 class WalletCreationService {
   WalletCreationService(
       {WalletType initialType,
-      this.appStore,
       this.secureStorage,
       this.keyService,
       this.sharedPreferences})
@@ -25,7 +22,6 @@ class WalletCreationService {
   }
 
   WalletType type;
-  final AppStore appStore;
   final FlutterSecureStorage secureStorage;
   final SharedPreferences sharedPreferences;
   final KeyService keyService;
@@ -36,33 +32,27 @@ class WalletCreationService {
     _service = getIt.get<WalletService>(param1: type);
   }
 
-  Future<void> create(WalletCredentials credentials) async {
+  Future<WalletBase> create(WalletCredentials credentials) async {
     final password = generateWalletPassword(type);
     credentials.password = password;
     await keyService.saveWalletPassword(
         password: password, walletName: credentials.name);
-    final wallet = await _service.create(credentials);
-    appStore.wallet = wallet;
-    appStore.authenticationStore.allowed();
+    return await _service.create(credentials);
   }
 
-  Future<void> restoreFromKeys(WalletCredentials credentials) async {
+  Future<WalletBase> restoreFromKeys(WalletCredentials credentials) async {
     final password = generateWalletPassword(type);
     credentials.password = password;
     await keyService.saveWalletPassword(
         password: password, walletName: credentials.name);
-    final wallet = await _service.restoreFromKeys(credentials);
-    appStore.wallet = wallet;
-    appStore.authenticationStore.allowed();
+    return await _service.restoreFromKeys(credentials);
   }
 
-  Future<void> restoreFromSeed(WalletCredentials credentials) async {
+  Future<WalletBase> restoreFromSeed(WalletCredentials credentials) async {
     final password = generateWalletPassword(type);
     credentials.password = password;
     await keyService.saveWalletPassword(
         password: password, walletName: credentials.name);
-    final wallet = await _service.restoreFromSeed(credentials);
-    appStore.wallet = wallet;
-    appStore.authenticationStore.allowed();
+    return await _service.restoreFromSeed(credentials);
   }
 }
diff --git a/lib/core/wallet_credentials.dart b/lib/core/wallet_credentials.dart
index 7dc93f848..3998bb005 100644
--- a/lib/core/wallet_credentials.dart
+++ b/lib/core/wallet_credentials.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 
 abstract class WalletCredentials {
   WalletCredentials({this.name, this.password, this.height});
diff --git a/lib/di.dart b/lib/di.dart
index efa9a90f2..4b5f5f077 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -1,10 +1,12 @@
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_service.dart';
 import 'package:cake_wallet/core/contact_service.dart';
 import 'package:cake_wallet/core/wallet_service.dart';
+import 'package:cake_wallet/entities/biometric_auth.dart';
 import 'package:cake_wallet/monero/monero_wallet_service.dart';
-import 'package:cake_wallet/src/domain/common/contact.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/entities/contact.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+
 // import 'package:cake_wallet/src/domain/services/wallet_service.dart';
 import 'package:cake_wallet/src/screens/contact/contact_list_page.dart';
 import 'package:cake_wallet/src/screens/contact/contact_page.dart';
@@ -12,9 +14,11 @@ import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dar
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart';
 import 'package:cake_wallet/src/screens/nodes/node_create_or_edit_page.dart';
 import 'package:cake_wallet/src/screens/nodes/nodes_list_page.dart';
+import 'package:cake_wallet/src/screens/rescan/rescan_page.dart';
 import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
 import 'package:cake_wallet/src/screens/send/send_template_page.dart';
 import 'package:cake_wallet/src/screens/settings/settings.dart';
+import 'package:cake_wallet/src/screens/setup_pin_code/setup_pin_code.dart';
 import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_page.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_template_page.dart';
@@ -24,7 +28,7 @@ import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 import 'package:cake_wallet/src/screens/monero_accounts/monero_account_list_page.dart';
 import 'package:cake_wallet/src/screens/monero_accounts/monero_account_edit_or_create_page.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
@@ -42,6 +46,8 @@ import 'package:cake_wallet/view_model/contact_list/contact_view_model.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/node_list_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
+import 'package:cake_wallet/view_model/rescan_view_model.dart';
+import 'package:cake_wallet/view_model/setup_pin_code_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart';
 import 'package:cake_wallet/view_model/auth_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
@@ -56,6 +62,7 @@ import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
@@ -65,51 +72,20 @@ import 'package:cake_wallet/view_model/wallet_restoration_from_seed_vm.dart';
 import 'package:cake_wallet/view_model/wallet_restoration_from_keys_vm.dart';
 import 'package:cake_wallet/core/wallet_creation_service.dart';
 import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/view_model/wallet_new_vm.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
 import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:cake_wallet/store/dashboard/trade_filter_store.dart';
 import 'package:cake_wallet/store/dashboard/transaction_filter_store.dart';
-import 'package:cake_wallet/store/dashboard/fiat_convertation_store.dart';
+import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 import 'package:cake_wallet/store/templates/send_template_store.dart';
 import 'package:cake_wallet/store/templates/exchange_template_store.dart';
-import 'package:cake_wallet/src/domain/common/template.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
+import 'package:cake_wallet/entities/template.dart';
+import 'package:cake_wallet/exchange/exchange_template.dart';
 
 final getIt = GetIt.instance;
 
-// FIXME: Move me.
-
-Stream<BoxEvent> _onNodesSourceChange;
-NodeListStore _nodeListStore;
-
-NodeListStore setupNodeListStore(Box<Node> nodeSource) {
-  if (_nodeListStore != null) {
-    return _nodeListStore;
-  }
-
-  _nodeListStore = NodeListStore();
-  _nodeListStore.replaceValues(nodeSource.values);
-  _onNodesSourceChange = nodeSource.watch();
-  _onNodesSourceChange.listen((event) {
-//    print(event);
-
-    if (event.deleted) {
-      _nodeListStore.nodes.removeWhere((n) {
-        return n.key != null ? n.key == event.key : true;
-      });
-    }
-
-    if (event.value is Node) {
-      final val = event.value as Node;
-      _nodeListStore.nodes.add(val);
-    }
-  });
-
-  return _nodeListStore;
-}
-
 Future setup(
     {Box<WalletInfo> walletInfoSource,
     Box<Node> nodeSource,
@@ -122,11 +98,13 @@ Future setup(
 
   final settingsStore = await SettingsStoreBase.load(nodeSource: nodeSource);
 
+  getIt.registerSingleton<Box<Node>>(nodeSource);
+
   getIt.registerSingleton<FlutterSecureStorage>(FlutterSecureStorage());
   getIt.registerSingleton(AuthenticationStore());
   getIt.registerSingleton<WalletListStore>(WalletListStore());
   getIt.registerSingleton(ContactListStore());
-  getIt.registerSingleton(setupNodeListStore(nodeSource));
+  getIt.registerSingleton(NodeListStoreBase.instance);
   getIt.registerSingleton<SettingsStore>(settingsStore);
   getIt.registerSingleton<AppStore>(AppStore(
       authenticationStore: getIt.get<AuthenticationStore>(),
@@ -140,7 +118,7 @@ Future setup(
       tradesSource: tradesSource, settingsStore: getIt.get<SettingsStore>()));
   getIt.registerSingleton<TradeFilterStore>(TradeFilterStore());
   getIt.registerSingleton<TransactionFilterStore>(TransactionFilterStore());
-  getIt.registerSingleton<FiatConvertationStore>(FiatConvertationStore());
+  getIt.registerSingleton<FiatConversionStore>(FiatConversionStore());
   getIt.registerSingleton<SendTemplateStore>(
       SendTemplateStore(templateSource: templates));
   getIt.registerSingleton<ExchangeTemplateStore>(
@@ -152,13 +130,12 @@ Future setup(
   getIt.registerFactoryParam<WalletCreationService, WalletType, void>(
       (type, _) => WalletCreationService(
           initialType: type,
-          appStore: getIt.get<AppStore>(),
           keyService: getIt.get<KeyService>(),
           secureStorage: getIt.get<FlutterSecureStorage>(),
           sharedPreferences: getIt.get<SharedPreferences>()));
 
   getIt.registerFactoryParam<WalletNewVM, WalletType, void>((type, _) =>
-      WalletNewVM(
+      WalletNewVM(getIt.get<AppStore>(),
           getIt.get<WalletCreationService>(param1: type), walletInfoSource,
           type: type));
 
@@ -168,7 +145,7 @@ Future setup(
     final language = args[1] as String;
     final mnemonic = args[2] as String;
 
-    return WalletRestorationFromSeedVM(
+    return WalletRestorationFromSeedVM(getIt.get<AppStore>(),
         getIt.get<WalletCreationService>(param1: type), walletInfoSource,
         type: type, language: language, seed: mnemonic);
   });
@@ -178,7 +155,7 @@ Future setup(
     final type = args.first as WalletType;
     final language = args[1] as String;
 
-    return WalletRestorationFromKeysVM(
+    return WalletRestorationFromKeysVM(getIt.get<AppStore>(),
         getIt.get<WalletCreationService>(param1: type), walletInfoSource,
         type: type, language: language);
   });
@@ -189,7 +166,7 @@ Future setup(
   getIt.registerFactory(() => BalanceViewModel(
       wallet: getIt.get<AppStore>().wallet,
       settingsStore: getIt.get<SettingsStore>(),
-      fiatConvertationStore: getIt.get<FiatConvertationStore>()));
+      fiatConvertationStore: getIt.get<FiatConversionStore>()));
 
   getIt.registerFactory(() => DashboardViewModel(
       balanceViewModel: getIt.get<BalanceViewModel>(),
@@ -203,38 +180,24 @@ Future setup(
       sharedPreferences: getIt.get<SharedPreferences>()));
 
   getIt.registerFactory<AuthViewModel>(() => AuthViewModel(
-      authService: getIt.get<AuthService>(),
-      sharedPreferences: getIt.get<SharedPreferences>()));
+      getIt.get<AuthService>(),
+      getIt.get<SharedPreferences>(),
+      getIt.get<SettingsStore>(),
+      BiometricAuth()));
 
   getIt.registerFactory<AuthPage>(
-      () => AuthPage(
-          allowBiometricalAuthentication: getIt
-              .get<AppStore>()
-              .settingsStore
-              .allowBiometricalAuthentication,
-          authViewModel: getIt.get<AuthViewModel>(),
-          onAuthenticationFinished: (isAuthenticated, __) {
+      () => AuthPage(getIt.get<AuthViewModel>(),
+              onAuthenticationFinished: (isAuthenticated, __) {
             if (isAuthenticated) {
               getIt.get<AuthenticationStore>().allowed();
             }
-          },
-          closable: false),
+          }, closable: false),
       instanceName: 'login');
 
   getIt
       .registerFactoryParam<AuthPage, void Function(bool, AuthPageState), void>(
-          (onAuthFinished, _) {
-    final allowBiometricalAuthentication =
-        getIt.get<AppStore>().settingsStore.allowBiometricalAuthentication;
-
-    print('allowBiometricalAuthentication $allowBiometricalAuthentication');
-
-    return AuthPage(
-        allowBiometricalAuthentication: allowBiometricalAuthentication,
-        authViewModel: getIt.get<AuthViewModel>(),
-        onAuthenticationFinished: onAuthFinished,
-        closable: false);
-  });
+          (onAuthFinished, _) => AuthPage(getIt.get<AuthViewModel>(),
+              onAuthenticationFinished: onAuthFinished, closable: false));
 
   getIt.registerFactory<DashboardPage>(() => DashboardPage(
       walletViewModel: getIt.get<DashboardViewModel>(),
@@ -256,13 +219,13 @@ Future setup(
   getIt.registerFactory<SendViewModel>(() => SendViewModel(
       getIt.get<AppStore>().wallet,
       getIt.get<AppStore>().settingsStore,
-      getIt.get<FiatConvertationStore>()));
+      getIt.get<FiatConversionStore>()));
 
   getIt.registerFactory(
       () => SendPage(sendViewModel: getIt.get<SendViewModel>()));
 
   getIt.registerFactory(
-           () => SendTemplatePage(sendViewModel: getIt.get<SendViewModel>()));
+      () => SendTemplatePage(sendViewModel: getIt.get<SendViewModel>()));
 
   getIt.registerFactory(() => WalletListViewModel(
       walletInfoSource, getIt.get<AppStore>(), getIt.get<KeyService>()));
@@ -387,6 +350,19 @@ Future setup(
         return null;
     }
   });
+
+  getIt.registerFactory<SetupPinCodeViewModel>(() => SetupPinCodeViewModel(
+      getIt.get<AuthService>(), getIt.get<SettingsStore>()));
+
+  getIt.registerFactoryParam<SetupPinCodePage,
+          void Function(BuildContext, String), void>(
+      (onSuccessfulPinSetup, _) => SetupPinCodePage(
+          getIt.get<SetupPinCodeViewModel>(),
+          onSuccessfulPinSetup: onSuccessfulPinSetup));
+
+  getIt.registerFactory(() => RescanViewModel(getIt.get<AppStore>().wallet));
+
+  getIt.registerFactory(() => RescanPage(getIt.get<RescanViewModel>()));
 }
 
 void setupThemeChangerStore(ThemeChanger themeChanger) {
diff --git a/lib/src/stores/action_list/action_list_display_mode.dart b/lib/entities/action_list_display_mode.dart
similarity index 100%
rename from lib/src/stores/action_list/action_list_display_mode.dart
rename to lib/entities/action_list_display_mode.dart
diff --git a/lib/src/domain/common/balance.dart b/lib/entities/balance.dart
similarity index 100%
rename from lib/src/domain/common/balance.dart
rename to lib/entities/balance.dart
diff --git a/lib/src/domain/common/balance_display_mode.dart b/lib/entities/balance_display_mode.dart
similarity index 94%
rename from lib/src/domain/common/balance_display_mode.dart
rename to lib/entities/balance_display_mode.dart
index 42dc09924..57197e57b 100644
--- a/lib/src/domain/common/balance_display_mode.dart
+++ b/lib/entities/balance_display_mode.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/enumerable_item.dart';
+import 'package:cake_wallet/entities/enumerable_item.dart';
 
 class BalanceDisplayMode extends EnumerableItem<int> with Serializable<int> {
   const BalanceDisplayMode({@required String title, @required int raw})
diff --git a/lib/src/domain/common/biometric_auth.dart b/lib/entities/biometric_auth.dart
similarity index 100%
rename from lib/src/domain/common/biometric_auth.dart
rename to lib/entities/biometric_auth.dart
diff --git a/lib/src/domain/common/calculate_estimated_fee.dart b/lib/entities/calculate_estimated_fee.dart
similarity index 85%
rename from lib/src/domain/common/calculate_estimated_fee.dart
rename to lib/entities/calculate_estimated_fee.dart
index 8d6aa6bc6..6c9200834 100644
--- a/lib/src/domain/common/calculate_estimated_fee.dart
+++ b/lib/entities/calculate_estimated_fee.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
 
 double calculateEstimatedFee({TransactionPriority priority}) {
   if (priority == TransactionPriority.slow) {
diff --git a/lib/src/domain/common/calculate_fiat_amount.dart b/lib/entities/calculate_fiat_amount.dart
similarity index 100%
rename from lib/src/domain/common/calculate_fiat_amount.dart
rename to lib/entities/calculate_fiat_amount.dart
diff --git a/lib/src/domain/common/calculate_fiat_amount_raw.dart b/lib/entities/calculate_fiat_amount_raw.dart
similarity index 100%
rename from lib/src/domain/common/calculate_fiat_amount_raw.dart
rename to lib/entities/calculate_fiat_amount_raw.dart
diff --git a/lib/src/domain/common/contact.dart b/lib/entities/contact.dart
similarity index 91%
rename from lib/src/domain/common/contact.dart
rename to lib/entities/contact.dart
index 4aca925eb..e54ab0126 100644
--- a/lib/src/domain/common/contact.dart
+++ b/lib/entities/contact.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 import 'package:cake_wallet/utils/mobx.dart';
 
 part 'contact.g.dart';
diff --git a/lib/src/domain/common/contact_model.dart b/lib/entities/contact_model.dart
similarity index 86%
rename from lib/src/domain/common/contact_model.dart
rename to lib/entities/contact_model.dart
index 94185a647..dacd1cfb1 100644
--- a/lib/src/domain/common/contact_model.dart
+++ b/lib/entities/contact_model.dart
@@ -1,7 +1,7 @@
 // import 'package:hive/hive.dart';
 // import 'package:mobx/mobx.dart';
-// import 'package:cake_wallet/src/domain/common/contact.dart';
-// import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+// import 'package:cake_wallet/entities/contact.dart';
+// import 'package:cake_wallet/entities/crypto_currency.dart';
 
 // part 'contact_model.g.dart';
 
diff --git a/lib/src/domain/common/crypto_amount_format.dart b/lib/entities/crypto_amount_format.dart
similarity index 100%
rename from lib/src/domain/common/crypto_amount_format.dart
rename to lib/entities/crypto_amount_format.dart
diff --git a/lib/src/domain/common/crypto_currency.dart b/lib/entities/crypto_currency.dart
similarity index 97%
rename from lib/src/domain/common/crypto_currency.dart
rename to lib/entities/crypto_currency.dart
index fb09ff181..722fc2aef 100644
--- a/lib/src/domain/common/crypto_currency.dart
+++ b/lib/entities/crypto_currency.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/enumerable_item.dart';
+import 'package:cake_wallet/entities/enumerable_item.dart';
 import 'package:hive/hive.dart';
 
 part 'crypto_currency.g.dart';
diff --git a/lib/entities/currency_for_wallet_type.dart b/lib/entities/currency_for_wallet_type.dart
new file mode 100644
index 000000000..840e75dd1
--- /dev/null
+++ b/lib/entities/currency_for_wallet_type.dart
@@ -0,0 +1,13 @@
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+
+CryptoCurrency currencyForWalletType(WalletType type) {
+  switch (type) {
+    case WalletType.bitcoin:
+      return CryptoCurrency.btc;
+    case WalletType.monero:
+      return CryptoCurrency.xmr;
+    default:
+      return null;
+  }
+}
\ No newline at end of file
diff --git a/lib/src/domain/common/currency_formatter.dart b/lib/entities/currency_formatter.dart
similarity index 74%
rename from lib/src/domain/common/currency_formatter.dart
rename to lib/entities/currency_formatter.dart
index efe1bf759..40326a7e6 100644
--- a/lib/src/domain/common/currency_formatter.dart
+++ b/lib/entities/currency_formatter.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 
 String cryptoToString(CryptoCurrency crypto) {
   switch (crypto) {
diff --git a/lib/src/domain/common/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
similarity index 89%
rename from lib/src/domain/common/default_settings_migration.dart
rename to lib/entities/default_settings_migration.dart
index 44165fdbf..f16349387 100644
--- a/lib/src/domain/common/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -1,13 +1,13 @@
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/store/settings_store.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/node_list.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/entities/node_list.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
 
 Future defaultSettingsMigration(
     {@required int version,
@@ -29,13 +29,13 @@ Future defaultSettingsMigration(
       switch (version) {
         case 1:
           await sharedPreferences.setString(
-              SettingsStoreBase.currentFiatCurrencyKey,
+              PreferencesKey.currentFiatCurrencyKey,
               FiatCurrency.usd.toString());
           await sharedPreferences.setInt(
-              SettingsStoreBase.currentTransactionPriorityKey,
+              PreferencesKey.currentTransactionPriorityKey,
               TransactionPriority.standart.raw);
           await sharedPreferences.setInt(
-              SettingsStoreBase.currentBalanceDisplayModeKey,
+              PreferencesKey.currentBalanceDisplayModeKey,
               BalanceDisplayMode.availableBalance.raw);
           await sharedPreferences.setBool('save_recipient_address', true);
           await resetToDefault(nodes);
diff --git a/lib/src/domain/common/digest_request.dart b/lib/entities/digest_request.dart
similarity index 100%
rename from lib/src/domain/common/digest_request.dart
rename to lib/entities/digest_request.dart
diff --git a/lib/src/domain/common/encrypt.dart b/lib/entities/encrypt.dart
similarity index 100%
rename from lib/src/domain/common/encrypt.dart
rename to lib/entities/encrypt.dart
diff --git a/lib/src/domain/common/enumerable_item.dart b/lib/entities/enumerable_item.dart
similarity index 100%
rename from lib/src/domain/common/enumerable_item.dart
rename to lib/entities/enumerable_item.dart
diff --git a/lib/src/domain/common/fiat_currency.dart b/lib/entities/fiat_currency.dart
similarity index 97%
rename from lib/src/domain/common/fiat_currency.dart
rename to lib/entities/fiat_currency.dart
index 7c86ad610..8066c8f6a 100644
--- a/lib/src/domain/common/fiat_currency.dart
+++ b/lib/entities/fiat_currency.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/enumerable_item.dart';
+import 'package:cake_wallet/entities/enumerable_item.dart';
 
 class FiatCurrency extends EnumerableItem<String> with Serializable<String> {
   const FiatCurrency({String symbol}) : super(title: symbol, raw: symbol);
diff --git a/lib/src/domain/common/format_amount.dart b/lib/entities/format_amount.dart
similarity index 100%
rename from lib/src/domain/common/format_amount.dart
rename to lib/entities/format_amount.dart
diff --git a/lib/src/domain/common/fs_migration.dart b/lib/entities/fs_migration.dart
similarity index 92%
rename from lib/src/domain/common/fs_migration.dart
rename to lib/entities/fs_migration.dart
index 0d848aeb9..bb674b493 100644
--- a/lib/src/domain/common/fs_migration.dart
+++ b/lib/entities/fs_migration.dart
@@ -1,10 +1,10 @@
 import 'dart:io';
 import 'dart:convert';
-import 'package:cake_wallet/src/domain/common/contact.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/entities/contact.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/exchange/trade.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:path_provider/path_provider.dart';
diff --git a/lib/src/domain/common/get_encryption_key.dart b/lib/entities/get_encryption_key.dart
similarity index 100%
rename from lib/src/domain/common/get_encryption_key.dart
rename to lib/entities/get_encryption_key.dart
diff --git a/lib/src/domain/common/language.dart b/lib/entities/language.dart
similarity index 100%
rename from lib/src/domain/common/language.dart
rename to lib/entities/language.dart
diff --git a/lib/entities/load_current_wallet.dart b/lib/entities/load_current_wallet.dart
new file mode 100644
index 000000000..ef690521f
--- /dev/null
+++ b/lib/entities/load_current_wallet.dart
@@ -0,0 +1,23 @@
+import 'package:cake_wallet/di.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/core/key_service.dart';
+import 'package:cake_wallet/core/wallet_service.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+
+Future<void> loadCurrentWallet() async {
+  final appStore = getIt.get<AppStore>();
+  final name = getIt
+      .get<SharedPreferences>()
+      .getString(PreferencesKey.currentWalletName);
+  final typeRaw =
+      getIt.get<SharedPreferences>().getInt(PreferencesKey.currentWalletType) ??
+          0;
+  final type = deserializeFromInt(typeRaw);
+  final password =
+      await getIt.get<KeyService>().getWalletPassword(walletName: name);
+  final _service = getIt.get<WalletService>(param1: type);
+  final wallet = await _service.openWallet(name, password);
+  appStore.wallet = wallet;
+}
diff --git a/lib/src/domain/common/mnemonic_item.dart b/lib/entities/mnemonic_item.dart
similarity index 100%
rename from lib/src/domain/common/mnemonic_item.dart
rename to lib/entities/mnemonic_item.dart
diff --git a/lib/src/domain/common/node.dart b/lib/entities/node.dart
similarity index 94%
rename from lib/src/domain/common/node.dart
rename to lib/entities/node.dart
index 931eabf6c..74643112a 100644
--- a/lib/src/domain/common/node.dart
+++ b/lib/entities/node.dart
@@ -3,8 +3,8 @@ import 'package:flutter/foundation.dart';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/common/digest_request.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/entities/digest_request.dart';
 
 part 'node.g.dart';
 
diff --git a/lib/src/domain/common/node_list.dart b/lib/entities/node_list.dart
similarity index 90%
rename from lib/src/domain/common/node_list.dart
rename to lib/entities/node_list.dart
index 67bfe6eac..118394e6f 100644
--- a/lib/src/domain/common/node_list.dart
+++ b/lib/entities/node_list.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
 import "package:yaml/yaml.dart";
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 Future<List<Node>> loadDefaultNodes() async {
   final nodesRaw = await rootBundle.loadString('assets/node_list.yml');
diff --git a/lib/src/domain/common/openalias_record.dart b/lib/entities/openalias_record.dart
similarity index 100%
rename from lib/src/domain/common/openalias_record.dart
rename to lib/entities/openalias_record.dart
diff --git a/lib/src/domain/common/parseBoolFromString.dart b/lib/entities/parseBoolFromString.dart
similarity index 100%
rename from lib/src/domain/common/parseBoolFromString.dart
rename to lib/entities/parseBoolFromString.dart
diff --git a/lib/src/domain/common/pathForWallet.dart b/lib/entities/pathForWallet.dart
similarity index 91%
rename from lib/src/domain/common/pathForWallet.dart
rename to lib/entities/pathForWallet.dart
index d7caf8c1d..7e21ac178 100644
--- a/lib/src/domain/common/pathForWallet.dart
+++ b/lib/entities/pathForWallet.dart
@@ -1,5 +1,5 @@
 import 'dart:io';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:flutter/foundation.dart';
 import 'package:path_provider/path_provider.dart';
 
diff --git a/lib/src/domain/common/pending_transaction.dart b/lib/entities/pending_transaction.dart
similarity index 92%
rename from lib/src/domain/common/pending_transaction.dart
rename to lib/entities/pending_transaction.dart
index 9168b3195..77e5d7b48 100644
--- a/lib/src/domain/common/pending_transaction.dart
+++ b/lib/entities/pending_transaction.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:cw_monero/transaction_history.dart' as transaction_history;
 import 'package:cw_monero/structs/pending_transaction.dart';
-import 'package:cake_wallet/src/domain/monero/monero_amount_format.dart';
+import 'package:cake_wallet/monero/monero_amount_format.dart';
 
 class PendingTransaction {
   PendingTransaction(
diff --git a/lib/entities/preferences_key.dart b/lib/entities/preferences_key.dart
new file mode 100644
index 000000000..53d59460a
--- /dev/null
+++ b/lib/entities/preferences_key.dart
@@ -0,0 +1,16 @@
+class PreferencesKey {
+  static const currentWalletType ='current_wallet_type';
+  static const currentWalletName ='current_wallet_name';
+  static const currentNodeIdKey = 'current_node_id';
+  static const currentBitcoinElectrumSererIdKey = 'current_node_id_btc';
+  static const currentFiatCurrencyKey = 'current_fiat_currency';
+  static const currentTransactionPriorityKey = 'current_fee_priority';
+  static const currentBalanceDisplayModeKey = 'current_balance_display_mode';
+  static const shouldSaveRecipientAddressKey = 'save_recipient_address';
+  static const allowBiometricalAuthenticationKey =
+      'allow_biometrical_authentication';
+  static const currentDarkTheme = 'dark_theme';
+  static const displayActionListModeKey = 'display_list_mode';
+  static const currentPinLength = 'current_pin_length';
+  static const currentLanguageCode = 'language_code';
+}
\ No newline at end of file
diff --git a/lib/src/domain/common/qr_scanner.dart b/lib/entities/qr_scanner.dart
similarity index 100%
rename from lib/src/domain/common/qr_scanner.dart
rename to lib/entities/qr_scanner.dart
diff --git a/lib/src/domain/common/secret_store_key.dart b/lib/entities/secret_store_key.dart
similarity index 100%
rename from lib/src/domain/common/secret_store_key.dart
rename to lib/entities/secret_store_key.dart
diff --git a/lib/src/domain/common/sync_status.dart b/lib/entities/sync_status.dart
similarity index 100%
rename from lib/src/domain/common/sync_status.dart
rename to lib/entities/sync_status.dart
diff --git a/lib/src/domain/common/template.dart b/lib/entities/template.dart
similarity index 100%
rename from lib/src/domain/common/template.dart
rename to lib/entities/template.dart
diff --git a/lib/src/domain/common/transaction_creation_credentials.dart b/lib/entities/transaction_creation_credentials.dart
similarity index 100%
rename from lib/src/domain/common/transaction_creation_credentials.dart
rename to lib/entities/transaction_creation_credentials.dart
diff --git a/lib/src/domain/monero/transaction_description.dart b/lib/entities/transaction_description.dart
similarity index 85%
rename from lib/src/domain/monero/transaction_description.dart
rename to lib/entities/transaction_description.dart
index 51f01e219..3f817fe4f 100644
--- a/lib/src/domain/monero/transaction_description.dart
+++ b/lib/entities/transaction_description.dart
@@ -7,6 +7,7 @@ class TransactionDescription extends HiveObject {
   TransactionDescription({this.id, this.recipientAddress});
 
   static const boxName = 'TransactionDescriptions';
+  static const boxKey = 'transactionDescriptionsBoxKey';
 
   @HiveField(0)
   String id;
diff --git a/lib/src/domain/common/transaction_direction.dart b/lib/entities/transaction_direction.dart
similarity index 100%
rename from lib/src/domain/common/transaction_direction.dart
rename to lib/entities/transaction_direction.dart
diff --git a/lib/src/domain/common/transaction_history.dart b/lib/entities/transaction_history.dart
similarity index 72%
rename from lib/src/domain/common/transaction_history.dart
rename to lib/entities/transaction_history.dart
index 57e508b59..55c02f247 100644
--- a/lib/src/domain/common/transaction_history.dart
+++ b/lib/entities/transaction_history.dart
@@ -1,5 +1,5 @@
 import 'package:rxdart/rxdart.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
 
 abstract class TransactionHistory {
   Observable<List<TransactionInfo>> transactions;
diff --git a/lib/src/domain/common/transaction_info.dart b/lib/entities/transaction_info.dart
similarity index 78%
rename from lib/src/domain/common/transaction_info.dart
rename to lib/entities/transaction_info.dart
index e5da3bed6..7dfaa64d3 100644
--- a/lib/src/domain/common/transaction_info.dart
+++ b/lib/entities/transaction_info.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
+import 'package:cake_wallet/entities/transaction_direction.dart';
 
 abstract class TransactionInfo extends Object {
   String id;
diff --git a/lib/src/domain/common/transaction_priority.dart b/lib/entities/transaction_priority.dart
similarity index 95%
rename from lib/src/domain/common/transaction_priority.dart
rename to lib/entities/transaction_priority.dart
index f611313e0..9bad84c9f 100644
--- a/lib/src/domain/common/transaction_priority.dart
+++ b/lib/entities/transaction_priority.dart
@@ -1,5 +1,5 @@
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/enumerable_item.dart';
+import 'package:cake_wallet/entities/enumerable_item.dart';
 
 class TransactionPriority extends EnumerableItem<int> with Serializable<int> {
   const TransactionPriority({String title, int raw})
diff --git a/lib/src/domain/common/wallet.dart b/lib/entities/wallet.dart
similarity index 67%
rename from lib/src/domain/common/wallet.dart
rename to lib/entities/wallet.dart
index e2cca5e58..90a3929fe 100644
--- a/lib/src/domain/common/wallet.dart
+++ b/lib/entities/wallet.dart
@@ -1,11 +1,11 @@
 import 'package:rxdart/rxdart.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/transaction_history.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/common/transaction_creation_credentials.dart';
-import 'package:cake_wallet/src/domain/common/pending_transaction.dart';
-import 'package:cake_wallet/src/domain/common/balance.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+import 'package:cake_wallet/entities/transaction_history.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/entities/transaction_creation_credentials.dart';
+import 'package:cake_wallet/entities/pending_transaction.dart';
+import 'package:cake_wallet/entities/balance.dart';
+import 'package:cake_wallet/entities/node.dart';
 
 abstract class Wallet {
   WalletType getType();
diff --git a/lib/src/domain/common/wallet_description.dart b/lib/entities/wallet_description.dart
similarity index 65%
rename from lib/src/domain/common/wallet_description.dart
rename to lib/entities/wallet_description.dart
index f56616cb1..1e25ffc1c 100644
--- a/lib/src/domain/common/wallet_description.dart
+++ b/lib/entities/wallet_description.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 class WalletDescription {
   WalletDescription({this.name, this.type});
diff --git a/lib/src/domain/common/wallet_info.dart b/lib/entities/wallet_info.dart
similarity index 94%
rename from lib/src/domain/common/wallet_info.dart
rename to lib/entities/wallet_info.dart
index c9682f103..97ae9f326 100644
--- a/lib/src/domain/common/wallet_info.dart
+++ b/lib/entities/wallet_info.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 part 'wallet_info.g.dart';
 
diff --git a/lib/src/domain/common/wallet_type.dart b/lib/entities/wallet_type.dart
similarity index 100%
rename from lib/src/domain/common/wallet_type.dart
rename to lib/entities/wallet_type.dart
diff --git a/lib/src/domain/common/wallets_manager.dart b/lib/entities/wallets_manager.dart
similarity index 79%
rename from lib/src/domain/common/wallets_manager.dart
rename to lib/entities/wallets_manager.dart
index a8d31a8a6..72c80de97 100644
--- a/lib/src/domain/common/wallets_manager.dart
+++ b/lib/entities/wallets_manager.dart
@@ -1,5 +1,5 @@
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/common/wallet_description.dart';
+import 'package:cake_wallet/entities/wallet.dart';
+import 'package:cake_wallet/entities/wallet_description.dart';
 
 abstract class WalletsManager {
   Future<Wallet> create(String name, String password, String language);
diff --git a/lib/src/domain/exchange/changenow/changenow_exchange_provider.dart b/lib/exchange/changenow/changenow_exchange_provider.dart
similarity index 86%
rename from lib/src/domain/exchange/changenow/changenow_exchange_provider.dart
rename to lib/exchange/changenow/changenow_exchange_provider.dart
index 7fc3f5d63..94f8ea6ac 100644
--- a/lib/src/domain/exchange/changenow/changenow_exchange_provider.dart
+++ b/lib/exchange/changenow/changenow_exchange_provider.dart
@@ -1,18 +1,18 @@
 import 'dart:convert';
-import 'package:cake_wallet/src/domain/exchange/trade_not_found_exeption.dart';
+import 'package:cake_wallet/exchange/trade_not_found_exeption.dart';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_pair.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/limits.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_state.dart';
-import 'package:cake_wallet/src/domain/exchange/changenow/changenow_request.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_not_created_exeption.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/exchange_pair.dart';
+import 'package:cake_wallet/exchange/exchange_provider.dart';
+import 'package:cake_wallet/exchange/limits.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+import 'package:cake_wallet/exchange/trade_request.dart';
+import 'package:cake_wallet/exchange/trade_state.dart';
+import 'package:cake_wallet/exchange/changenow/changenow_request.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/trade_not_created_exeption.dart';
 
 class ChangeNowExchangeProvider extends ExchangeProvider {
   ChangeNowExchangeProvider()
diff --git a/lib/src/domain/exchange/changenow/changenow_request.dart b/lib/exchange/changenow/changenow_request.dart
similarity index 72%
rename from lib/src/domain/exchange/changenow/changenow_request.dart
rename to lib/exchange/changenow/changenow_request.dart
index 0201cb3c6..1f79dfa47 100644
--- a/lib/src/domain/exchange/changenow/changenow_request.dart
+++ b/lib/exchange/changenow/changenow_request.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/trade_request.dart';
 
 class ChangeNowRequest extends TradeRequest {
   ChangeNowRequest(
diff --git a/lib/src/domain/exchange/exchange_pair.dart b/lib/exchange/exchange_pair.dart
similarity index 70%
rename from lib/src/domain/exchange/exchange_pair.dart
rename to lib/exchange/exchange_pair.dart
index 42e2b5db0..b8b77a0dd 100644
--- a/lib/src/domain/exchange/exchange_pair.dart
+++ b/lib/exchange/exchange_pair.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 
 class ExchangePair {
   ExchangePair({this.from, this.to, this.reverse = true});
diff --git a/lib/src/domain/exchange/exchange_provider.dart b/lib/exchange/exchange_provider.dart
similarity index 56%
rename from lib/src/domain/exchange/exchange_provider.dart
rename to lib/exchange/exchange_provider.dart
index 9079d367d..418d20b8c 100644
--- a/lib/src/domain/exchange/exchange_provider.dart
+++ b/lib/exchange/exchange_provider.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_pair.dart';
-import 'package:cake_wallet/src/domain/exchange/limits.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/trade_request.dart';
+import 'package:cake_wallet/exchange/exchange_pair.dart';
+import 'package:cake_wallet/exchange/limits.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 
 abstract class ExchangeProvider {
   ExchangeProvider({this.pairList});
diff --git a/lib/src/domain/exchange/exchange_provider_description.dart b/lib/exchange/exchange_provider_description.dart
similarity index 91%
rename from lib/src/domain/exchange/exchange_provider_description.dart
rename to lib/exchange/exchange_provider_description.dart
index 67a2565d8..bb3b621b5 100644
--- a/lib/src/domain/exchange/exchange_provider_description.dart
+++ b/lib/exchange/exchange_provider_description.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/enumerable_item.dart';
+import 'package:cake_wallet/entities/enumerable_item.dart';
 
 class ExchangeProviderDescription extends EnumerableItem<int>
     with Serializable<int> {
diff --git a/lib/src/domain/exchange/exchange_template.dart b/lib/exchange/exchange_template.dart
similarity index 100%
rename from lib/src/domain/exchange/exchange_template.dart
rename to lib/exchange/exchange_template.dart
diff --git a/lib/src/stores/exchange/exchange_trade_state.dart b/lib/exchange/exchange_trade_state.dart
similarity index 88%
rename from lib/src/stores/exchange/exchange_trade_state.dart
rename to lib/exchange/exchange_trade_state.dart
index 1f9eecad1..324ae9338 100644
--- a/lib/src/stores/exchange/exchange_trade_state.dart
+++ b/lib/exchange/exchange_trade_state.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/exchange/trade.dart';
 
 abstract class ExchangeTradeState {}
 
diff --git a/lib/src/domain/exchange/limits.dart b/lib/exchange/limits.dart
similarity index 100%
rename from lib/src/domain/exchange/limits.dart
rename to lib/exchange/limits.dart
diff --git a/lib/src/stores/exchange/limits_state.dart b/lib/exchange/limits_state.dart
similarity index 87%
rename from lib/src/stores/exchange/limits_state.dart
rename to lib/exchange/limits_state.dart
index ccc5934d8..66adaa8a2 100644
--- a/lib/src/stores/exchange/limits_state.dart
+++ b/lib/exchange/limits_state.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/exchange/limits.dart';
+import 'package:cake_wallet/exchange/limits.dart';
 
 abstract class LimitsState {}
 
diff --git a/lib/exchange/morphtoken/morphtoken_exchange_provider.dart b/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
new file mode 100644
index 000000000..ec632cccb
--- /dev/null
+++ b/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
@@ -0,0 +1,202 @@
+import 'dart:convert';
+import 'package:cake_wallet/core/amount_converter.dart';
+import 'package:cake_wallet/monero/monero_amount_format.dart';
+import 'package:hive/hive.dart';
+import 'package:cake_wallet/exchange/trade_not_found_exeption.dart';
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/exchange_pair.dart';
+import 'package:cake_wallet/exchange/exchange_provider.dart';
+import 'package:cake_wallet/exchange/limits.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+import 'package:cake_wallet/exchange/trade_request.dart';
+import 'package:cake_wallet/exchange/trade_state.dart';
+import 'package:cake_wallet/exchange/morphtoken/morphtoken_request.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/trade_not_created_exeption.dart';
+
+class MorphTokenExchangeProvider extends ExchangeProvider {
+  MorphTokenExchangeProvider({@required this.trades})
+      : super(pairList: [
+          ExchangePair(from: CryptoCurrency.xmr, to: CryptoCurrency.eth),
+          ExchangePair(from: CryptoCurrency.xmr, to: CryptoCurrency.bch),
+          ExchangePair(from: CryptoCurrency.xmr, to: CryptoCurrency.ltc),
+          ExchangePair(from: CryptoCurrency.xmr, to: CryptoCurrency.dash),
+          ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.btc),
+          ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.eth),
+          ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.bch),
+          ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.ltc),
+          ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.xmr),
+          ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.btc),
+          ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.eth),
+          ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.bch),
+          ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.dash),
+          ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.xmr),
+          ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.btc),
+          ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.eth),
+          ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.ltc),
+          ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.dash),
+          ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.xmr),
+          ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.btc),
+          ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.bch),
+          ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.ltc),
+          ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.dash),
+          ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.xmr),
+          ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.eth),
+          ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.bch),
+          ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.ltc),
+          ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.dash),
+          ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.xmr)
+        ]);
+
+  Box<Trade> trades;
+
+  static const apiUri = 'https://api.morphtoken.com';
+  static const _morphURISuffix = '/morph';
+  static const _limitsURISuffix = '/limits';
+  static const _ratesURISuffix = '/rates';
+  static const weight = 10000;
+
+  @override
+  String get title => 'MorphToken';
+
+  @override
+  ExchangeProviderDescription get description =>
+      ExchangeProviderDescription.morphToken;
+
+  @override
+  Future<Limits> fetchLimits({CryptoCurrency from, CryptoCurrency to}) async {
+    final url = apiUri + _limitsURISuffix;
+    final headers = {'Content-type': 'application/json'};
+    final body = json.encode({
+      "input": {"asset": from.toString()},
+      "output": [
+        {"asset": to.toString(), "weight": weight}
+      ]
+    });
+    final response = await post(url, headers: headers, body: body);
+    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
+
+    final min = responseJSON['input']['limits']['min'] as int;
+    int max;
+    double ethMax;
+
+    if (from == CryptoCurrency.eth) {
+      ethMax = responseJSON['input']['limits']['max'] as double;
+    } else {
+      max = responseJSON['input']['limits']['max'] as int;
+    }
+
+    double minFormatted = AmountConverter.amountIntToDouble(from, min);
+    double maxFormatted = AmountConverter.amountIntToDouble(from, max);
+
+    return Limits(min: minFormatted, max: maxFormatted);
+  }
+
+  @override
+  Future<Trade> createTrade({TradeRequest request}) async {
+    const url = apiUri + _morphURISuffix;
+    final _request = request as MorphTokenRequest;
+    final body = {
+      "input": {
+        "asset": _request.from.toString(),
+        "refund": _request.refundAddress
+      },
+      "output": [
+        {
+          "asset": _request.to.toString(),
+          "weight": weight,
+          "address": _request.address
+        }
+      ],
+      "tag": "cakewallet"
+    };
+
+    final response = await post(url,
+        headers: {'Content-Type': 'application/json'}, body: json.encode(body));
+
+    if (response.statusCode != 200) {
+      if (response.statusCode == 400) {
+        final responseJSON = json.decode(response.body) as Map<String, dynamic>;
+        final error = responseJSON['description'] as String;
+
+        throw TradeNotCreatedException(description, description: error);
+      }
+
+      throw TradeNotCreatedException(description);
+    }
+
+    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
+    final id = responseJSON['id'] as String;
+
+    return Trade(
+        id: id,
+        provider: description,
+        from: _request.from,
+        to: _request.to,
+        state: TradeState.created,
+        amount: _request.amount,
+        createdAt: DateTime.now());
+  }
+
+  @override
+  Future<Trade> findTradeById({@required String id}) async {
+    final url = apiUri + _morphURISuffix + '/' + id;
+    final response = await get(url);
+
+    if (response.statusCode != 200) {
+      if (response.statusCode == 400) {
+        final responseJSON = json.decode(response.body) as Map<String, dynamic>;
+        final error = responseJSON['description'] as String;
+
+        throw TradeNotFoundException(id,
+            provider: description, description: error);
+      }
+
+      throw TradeNotFoundException(id, provider: description);
+    }
+
+    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
+    final fromCurrency = responseJSON['input']['asset'] as String;
+    final from = CryptoCurrency.fromString(fromCurrency.toLowerCase());
+    final toCurrency = responseJSON['output'][0]['asset'] as String;
+    final to = CryptoCurrency.fromString(toCurrency.toLowerCase());
+    final inputAddress = responseJSON['input']['deposit_address'] as String;
+    final status = responseJSON['state'] as String;
+    final state = TradeState.deserialize(raw: status.toLowerCase());
+
+    String amount = "";
+    for (final trade in trades.values) {
+      if (trade.id == id) {
+        amount = trade.amount;
+        break;
+      }
+    }
+
+    return Trade(
+        id: id,
+        from: from,
+        to: to,
+        provider: description,
+        inputAddress: inputAddress,
+        amount: amount,
+        state: state);
+  }
+
+  @override
+  Future<double> calculateAmount(
+      {CryptoCurrency from, CryptoCurrency to, double amount}) async {
+    final url = apiUri + _ratesURISuffix;
+    final response = await get(url);
+    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
+    final rate = responseJSON['data'][from.toString()][to.toString()] as String;
+
+    try {
+      final estimatedAmount = double.parse(rate) * amount;
+      return estimatedAmount;
+    } catch (e) {
+      return 0.0;
+    }
+  }
+}
diff --git a/lib/src/domain/exchange/morphtoken/morphtoken_request.dart b/lib/exchange/morphtoken/morphtoken_request.dart
similarity index 73%
rename from lib/src/domain/exchange/morphtoken/morphtoken_request.dart
rename to lib/exchange/morphtoken/morphtoken_request.dart
index f034372d9..d92a643e8 100644
--- a/lib/src/domain/exchange/morphtoken/morphtoken_request.dart
+++ b/lib/exchange/morphtoken/morphtoken_request.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/trade_request.dart';
 
 class MorphTokenRequest extends TradeRequest {
   MorphTokenRequest(
diff --git a/lib/src/domain/exchange/trade.dart b/lib/exchange/trade.dart
similarity index 88%
rename from lib/src/domain/exchange/trade.dart
rename to lib/exchange/trade.dart
index 83e09a4b4..c7110f55f 100644
--- a/lib/src/domain/exchange/trade.dart
+++ b/lib/exchange/trade.dart
@@ -1,8 +1,8 @@
 import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_state.dart';
-import 'package:cake_wallet/src/domain/common/format_amount.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/trade_state.dart';
+import 'package:cake_wallet/entities/format_amount.dart';
 
 part 'trade.g.dart';
 
@@ -28,6 +28,7 @@ class Trade extends HiveObject {
         stateRaw = state?.raw;
 
   static const boxName = 'Trades';
+  static const boxKey = 'tradesBoxKey';
 
   @HiveField(0)
   String id;
diff --git a/lib/src/domain/exchange/trade_not_created_exeption.dart b/lib/exchange/trade_not_created_exeption.dart
similarity index 84%
rename from lib/src/domain/exchange/trade_not_created_exeption.dart
rename to lib/exchange/trade_not_created_exeption.dart
index 2fc037a06..181d05397 100644
--- a/lib/src/domain/exchange/trade_not_created_exeption.dart
+++ b/lib/exchange/trade_not_created_exeption.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class TradeNotCreatedException implements Exception {
diff --git a/lib/src/domain/exchange/trade_not_found_exeption.dart b/lib/exchange/trade_not_found_exeption.dart
similarity index 85%
rename from lib/src/domain/exchange/trade_not_found_exeption.dart
rename to lib/exchange/trade_not_found_exeption.dart
index ad789a215..0d0dbd944 100644
--- a/lib/src/domain/exchange/trade_not_found_exeption.dart
+++ b/lib/exchange/trade_not_found_exeption.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class TradeNotFoundException implements Exception {
diff --git a/lib/src/domain/exchange/trade_request.dart b/lib/exchange/trade_request.dart
similarity index 100%
rename from lib/src/domain/exchange/trade_request.dart
rename to lib/exchange/trade_request.dart
diff --git a/lib/src/domain/exchange/trade_state.dart b/lib/exchange/trade_state.dart
similarity index 97%
rename from lib/src/domain/exchange/trade_state.dart
rename to lib/exchange/trade_state.dart
index 0a94cf4c0..7095626b9 100644
--- a/lib/src/domain/exchange/trade_state.dart
+++ b/lib/exchange/trade_state.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/enumerable_item.dart';
+import 'package:cake_wallet/entities/enumerable_item.dart';
 
 class TradeState extends EnumerableItem<String> with Serializable<String> {
   const TradeState({@required String raw, @required String title})
diff --git a/lib/src/domain/exchange/xmrto/xmrto_exchange_provider.dart b/lib/exchange/xmrto/xmrto_exchange_provider.dart
similarity index 88%
rename from lib/src/domain/exchange/xmrto/xmrto_exchange_provider.dart
rename to lib/exchange/xmrto/xmrto_exchange_provider.dart
index d65f23db3..ca1253310 100644
--- a/lib/src/domain/exchange/xmrto/xmrto_exchange_provider.dart
+++ b/lib/exchange/xmrto/xmrto_exchange_provider.dart
@@ -1,17 +1,17 @@
 import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_pair.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/limits.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_state.dart';
-import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_trade_request.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_not_created_exeption.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_not_found_exeption.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/exchange_pair.dart';
+import 'package:cake_wallet/exchange/exchange_provider.dart';
+import 'package:cake_wallet/exchange/limits.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+import 'package:cake_wallet/exchange/trade_request.dart';
+import 'package:cake_wallet/exchange/trade_state.dart';
+import 'package:cake_wallet/exchange/xmrto/xmrto_trade_request.dart';
+import 'package:cake_wallet/exchange/trade_not_created_exeption.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/trade_not_found_exeption.dart';
 
 class XMRTOExchangeProvider extends ExchangeProvider {
   XMRTOExchangeProvider()
diff --git a/lib/src/domain/exchange/xmrto/xmrto_trade_request.dart b/lib/exchange/xmrto/xmrto_trade_request.dart
similarity index 74%
rename from lib/src/domain/exchange/xmrto/xmrto_trade_request.dart
rename to lib/exchange/xmrto/xmrto_trade_request.dart
index 204798698..a456b572a 100644
--- a/lib/src/domain/exchange/xmrto/xmrto_trade_request.dart
+++ b/lib/exchange/xmrto/xmrto_trade_request.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/trade_request.dart';
 
 class XMRTOTradeRequest extends TradeRequest {
   XMRTOTradeRequest(
diff --git a/lib/main.dart b/lib/main.dart
index 19e4fe1b8..6370bf55d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/entities/transaction_description.dart';
+import 'package:cake_wallet/entities/transaction_description.dart';
 import 'package:cake_wallet/reactions/bootstrap.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/store/app_store.dart';
@@ -21,38 +23,41 @@ import 'package:cw_monero/wallet.dart' as monero_wallet;
 import 'package:cake_wallet/router.dart';
 import 'theme_changer.dart';
 import 'themes.dart';
-import 'package:cake_wallet/src/domain/common/get_encryption_key.dart';
-import 'package:cake_wallet/src/domain/common/contact.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/monero/transaction_description.dart';
+import 'package:cake_wallet/entities/get_encryption_key.dart';
+import 'package:cake_wallet/entities/contact.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+
+// import 'package:cake_wallet/monero/transaction_description.dart';
 import 'package:cake_wallet/src/reactions/set_reactions.dart';
-import 'package:cake_wallet/src/stores/login/login_store.dart';
-import 'package:cake_wallet/src/stores/balance/balance_store.dart';
-import 'package:cake_wallet/src/stores/sync/sync_store.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/stores/send_template/send_template_store.dart';
-import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart';
+
+// import 'package:cake_wallet/src/stores/login/login_store.dart';
+// import 'package:cake_wallet/src/stores/balance/balance_store.dart';
+// import 'package:cake_wallet/src/stores/sync/sync_store.dart';
+// import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
+// import 'package:cake_wallet/src/stores/send_template/send_template_store.dart';
+// import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart';
 import 'package:cake_wallet/src/screens/root/root.dart';
 
 //import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/src/stores/price/price_store.dart';
-import 'package:cake_wallet/src/domain/services/user_service.dart';
-import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/default_settings_migration.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/common/template.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/domain/services/fiat_convertation_service.dart';
+// import 'package:cake_wallet/src/stores/settings/settings_store.dart';
+// import 'package:cake_wallet/src/stores/price/price_store.dart';
+// import 'package:cake_wallet/src/domain/services/user_service.dart';
+// import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/default_settings_migration.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/entities/template.dart';
+import 'package:cake_wallet/exchange/exchange_template.dart';
+
+// import 'package:cake_wallet/src/domain/services/wallet_service.dart';
+// import 'package:cake_wallet/src/domain/services/fiat_convertation_service.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/language.dart';
-import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart';
+import 'package:cake_wallet/entities/language.dart';
+// import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart';
 
 bool isThemeChangerRegistered = false;
 
@@ -74,12 +79,9 @@ void main() async {
 
   final secureStorage = FlutterSecureStorage();
   final transactionDescriptionsBoxKey = await getEncryptionKey(
-      secureStorage: secureStorage,
-      forKey: 'transactionDescriptionsBoxKey'); // FIXME: Unnamed constant
+      secureStorage: secureStorage, forKey: TransactionDescription.boxKey);
   final tradesBoxKey = await getEncryptionKey(
-      secureStorage: secureStorage,
-      forKey: 'tradesBoxKey'); // FIXME: Unnamed constant
-
+      secureStorage: secureStorage, forKey: Trade.boxKey);
   final contacts = await Hive.openBox<Contact>(Contact.boxName);
   final nodes = await Hive.openBox<Node>(Node.boxName);
   final transactionDescriptions = await Hive.openBox<TransactionDescription>(
@@ -93,35 +95,35 @@ void main() async {
       await Hive.openBox<ExchangeTemplate>(ExchangeTemplate.boxName);
 
   final sharedPreferences = await SharedPreferences.getInstance();
-  final walletService = WalletService();
-  final fiatConvertationService = FiatConvertationService();
-  final walletListService = WalletListService(
-      secureStorage: secureStorage,
-      walletInfoSource: walletInfoSource,
-      walletService: walletService,
-      sharedPreferences: sharedPreferences);
-  final userService = UserService(
-      sharedPreferences: sharedPreferences, secureStorage: secureStorage);
-  final settingsStore = await SettingsStoreBase.load(
-      nodes: nodes,
-      sharedPreferences: sharedPreferences,
-      initialFiatCurrency: FiatCurrency.usd,
-      initialTransactionPriority: TransactionPriority.slow,
-      initialBalanceDisplayMode: BalanceDisplayMode.availableBalance);
-  final priceStore = PriceStore();
-  final walletStore =
-      WalletStore(walletService: walletService, settingsStore: settingsStore);
-  final syncStore = SyncStore(walletService: walletService);
-  final balanceStore = BalanceStore(
-      walletService: walletService,
-      settingsStore: settingsStore,
-      priceStore: priceStore);
-  final loginStore = LoginStore(
-      sharedPreferences: sharedPreferences, walletsService: walletListService);
-  final seedLanguageStore = SeedLanguageStore();
-  final sendTemplateStore = SendTemplateStore(templateSource: templates);
-  final exchangeTemplateStore =
-      ExchangeTemplateStore(templateSource: exchangeTemplates);
+  // final walletService = WalletService();
+  // final fiatConvertationService = FiatConvertationService();
+  // final walletListService = WalletListService(
+  //     secureStorage: secureStorage,
+  //     walletInfoSource: walletInfoSource,
+  //     walletService: walletService,
+  //     sharedPreferences: sharedPreferences);
+  // final userService = UserService(
+  //     sharedPreferences: sharedPreferences, secureStorage: secureStorage);
+  // final settingsStore = await SettingsStoreBase.load(
+  //     nodes: nodes,
+  //     sharedPreferences: sharedPreferences,
+  //     initialFiatCurrency: FiatCurrency.usd,
+  //     initialTransactionPriority: TransactionPriority.slow,
+  //     initialBalanceDisplayMode: BalanceDisplayMode.availableBalance);
+  // final priceStore = PriceStore();
+  // final walletStore =
+  //     WalletStore(walletService: walletService, settingsStore: settingsStore);
+  // final syncStore = SyncStore(walletService: walletService);
+  // final balanceStore = BalanceStore(
+  //     walletService: walletService,
+  //     settingsStore: settingsStore,
+  //     priceStore: priceStore);
+  // final loginStore = LoginStore(
+  //     sharedPreferences: sharedPreferences, walletsService: walletListService);
+  // final seedLanguageStore = SeedLanguageStore();
+  // final sendTemplateStore = SendTemplateStore(templateSource: templates);
+  // final exchangeTemplateStore =
+  //     ExchangeTemplateStore(templateSource: exchangeTemplates);
 
   final walletCreationService = WalletCreationService();
   final authService = AuthService();
@@ -132,42 +134,21 @@ void main() async {
       walletInfoSource: walletInfoSource,
       contactSource: contacts,
       tradesSource: trades,
-      fiatConvertationService: fiatConvertationService,
+      // fiatConvertationService: fiatConvertationService,
       templates: templates,
       exchangeTemplates: exchangeTemplates,
       initialMigrationVersion: 4);
 
-  setReactions(
-      settingsStore: settingsStore,
-      priceStore: priceStore,
-      syncStore: syncStore,
-      walletStore: walletStore,
-      walletService: walletService,
-//      authenticationStore: authenticationStore,
-      loginStore: loginStore);
+//   setReactions(
+//       settingsStore: settingsStore,
+//       priceStore: priceStore,
+//       syncStore: syncStore,
+//       walletStore: walletStore,
+//       walletService: walletService,
+// //      authenticationStore: authenticationStore,
+//       loginStore: loginStore);
 
-  runApp(MultiProvider(providers: [
-    Provider(create: (_) => sharedPreferences),
-    Provider(create: (_) => walletService),
-    Provider(create: (_) => walletListService),
-    Provider(create: (_) => userService),
-    Provider(create: (_) => settingsStore),
-    Provider(create: (_) => priceStore),
-    Provider(create: (_) => walletStore),
-    Provider(create: (_) => syncStore),
-    Provider(create: (_) => balanceStore),
-//    Provider(create: (_) => authenticationStore),
-    Provider(create: (_) => contacts),
-    Provider(create: (_) => nodes),
-    Provider(create: (_) => transactionDescriptions),
-    Provider(create: (_) => trades),
-    Provider(create: (_) => seedLanguageStore),
-    Provider(create: (_) => sendTemplateStore),
-    Provider(create: (_) => exchangeTemplateStore),
-//    Provider(create: (_) => appStore),
-    Provider(create: (_) => walletCreationService),
-    Provider(create: (_) => authService)
-  ], child: CakeWalletApp()));
+  runApp(CakeWalletApp());
 }
 
 Future<void> initialSetup(
@@ -176,7 +157,7 @@ Future<void> initialSetup(
     @required Box<WalletInfo> walletInfoSource,
     @required Box<Contact> contactSource,
     @required Box<Trade> tradesSource,
-    @required FiatConvertationService fiatConvertationService,
+    // @required FiatConvertationService fiatConvertationService,
     @required Box<Template> templates,
     @required Box<ExchangeTemplate> exchangeTemplates,
     int initialMigrationVersion = 4}) async {
@@ -191,9 +172,7 @@ Future<void> initialSetup(
       tradesSource: tradesSource,
       templates: templates,
       exchangeTemplates: exchangeTemplates);
-  await bootstrap(
-      fiatConvertationService: fiatConvertationService,
-      navigatorKey: navigatorKey);
+  await bootstrap(navigatorKey);
   monero_wallet.onStartup();
 }
 
@@ -220,22 +199,22 @@ class CakeWalletApp extends StatelessWidget {
 class MaterialAppWithTheme extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final sharedPreferences = Provider.of<SharedPreferences>(context);
-    final walletService = Provider.of<WalletService>(context);
-    final walletListService = Provider.of<WalletListService>(context);
-    final userService = Provider.of<UserService>(context);
-    final settingsStore = Provider.of<SettingsStore>(context);
-    final priceStore = Provider.of<PriceStore>(context);
-    final walletStore = Provider.of<WalletStore>(context);
-    final syncStore = Provider.of<SyncStore>(context);
-    final balanceStore = Provider.of<BalanceStore>(context);
+    // final sharedPreferences = Provider.of<SharedPreferences>(context);
+    // final walletService = Provider.of<WalletService>(context);
+    // final walletListService = Provider.of<WalletListService>(context);
+    // final userService = Provider.of<UserService>(context);
+    // final settingsStore = Provider.of<SettingsStore>(context);
+    // final priceStore = Provider.of<PriceStore>(context);
+    // final walletStore = Provider.of<WalletStore>(context);
+    // final syncStore = Provider.of<SyncStore>(context);
+    // final balanceStore = Provider.of<BalanceStore>(context);
     final theme = Provider.of<ThemeChanger>(context);
-    final currentLanguage = Provider.of<Language>(context);
-    final contacts = Provider.of<Box<Contact>>(context);
-    final nodes = Provider.of<Box<Node>>(context);
-    final trades = Provider.of<Box<Trade>>(context);
-    final transactionDescriptions =
-        Provider.of<Box<TransactionDescription>>(context);
+    // final currentLanguage = Provider.of<Language>(context);
+    // final contacts = Provider.of<Box<Contact>>(context);
+    // final nodes = Provider.of<Box<Node>>(context);
+    // final trades = Provider.of<Box<Trade>>(context);
+    // final transactionDescriptions =
+    //     Provider.of<Box<TransactionDescription>>(context);
 
     if (!isThemeChangerRegistered) {
       setupThemeChangerStore(theme);
@@ -252,16 +231,9 @@ class MaterialAppWithTheme extends StatelessWidget {
     final statusBarIconBrightness =
         _settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
     final authenticationStore = getIt.get<AuthenticationStore>();
-    String initialRoute;
-
-    switch (authenticationStore.state) {
-      case AuthenticationState.denied:
-        initialRoute = Routes.welcome;
-        break;
-      default:
-        initialRoute = Routes.login;
-        break;
-    }
+    final initialRoute = authenticationStore.state == AuthenticationState.denied
+        ? Routes.welcome
+        : Routes.login;
 
     SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
         statusBarColor: statusBarColor,
@@ -281,22 +253,8 @@ class MaterialAppWithTheme extends StatelessWidget {
             GlobalWidgetsLocalizations.delegate,
           ],
           supportedLocales: S.delegate.supportedLocales,
-          locale: Locale(currentLanguage.getCurrentLanguage()),
-          onGenerateRoute: (settings) => Router.generateRoute(
-              sharedPreferences: sharedPreferences,
-              walletListService: walletListService,
-              walletService: walletService,
-              userService: userService,
-              settings: settings,
-              priceStore: priceStore,
-              walletStore: walletStore,
-              syncStore: syncStore,
-              balanceStore: balanceStore,
-              settingsStore: settingsStore,
-              contacts: contacts,
-              nodes: nodes,
-              trades: trades,
-              transactionDescriptions: transactionDescriptions),
+          // locale: Locale(currentLanguage.getCurrentLanguage()),
+          onGenerateRoute: (settings) => Router.generateRoute(settings),
           initialRoute: initialRoute,
         ));
   }
diff --git a/lib/src/domain/monero/account.dart b/lib/monero/account.dart
similarity index 100%
rename from lib/src/domain/monero/account.dart
rename to lib/monero/account.dart
diff --git a/lib/src/domain/monero/get_height_by_date.dart b/lib/monero/get_height_by_date.dart
similarity index 97%
rename from lib/src/domain/monero/get_height_by_date.dart
rename to lib/monero/get_height_by_date.dart
index 1e12312ab..d6dff557e 100644
--- a/lib/src/domain/monero/get_height_by_date.dart
+++ b/lib/monero/get_height_by_date.dart
@@ -1,5 +1,7 @@
 import 'package:intl/intl.dart';
 
+// FIXME: Hardcoded values; Works only for monero
+
 final dateFormat = DateFormat('yyyy-MM');
 final dates = {
   "2014-5": 18844,
diff --git a/lib/src/domain/monero/mnemonics/chinese_simplified.dart b/lib/monero/mnemonics/chinese_simplified.dart
similarity index 100%
rename from lib/src/domain/monero/mnemonics/chinese_simplified.dart
rename to lib/monero/mnemonics/chinese_simplified.dart
diff --git a/lib/src/domain/monero/mnemonics/dutch.dart b/lib/monero/mnemonics/dutch.dart
similarity index 100%
rename from lib/src/domain/monero/mnemonics/dutch.dart
rename to lib/monero/mnemonics/dutch.dart
diff --git a/lib/src/domain/monero/mnemonics/english.dart b/lib/monero/mnemonics/english.dart
similarity index 100%
rename from lib/src/domain/monero/mnemonics/english.dart
rename to lib/monero/mnemonics/english.dart
diff --git a/lib/src/domain/monero/mnemonics/german.dart b/lib/monero/mnemonics/german.dart
similarity index 100%
rename from lib/src/domain/monero/mnemonics/german.dart
rename to lib/monero/mnemonics/german.dart
diff --git a/lib/src/domain/monero/mnemonics/japanese.dart b/lib/monero/mnemonics/japanese.dart
similarity index 100%
rename from lib/src/domain/monero/mnemonics/japanese.dart
rename to lib/monero/mnemonics/japanese.dart
diff --git a/lib/src/domain/monero/mnemonics/portuguese.dart b/lib/monero/mnemonics/portuguese.dart
similarity index 100%
rename from lib/src/domain/monero/mnemonics/portuguese.dart
rename to lib/monero/mnemonics/portuguese.dart
diff --git a/lib/src/domain/monero/mnemonics/russian.dart b/lib/monero/mnemonics/russian.dart
similarity index 100%
rename from lib/src/domain/monero/mnemonics/russian.dart
rename to lib/monero/mnemonics/russian.dart
diff --git a/lib/src/domain/monero/mnemonics/spanish.dart b/lib/monero/mnemonics/spanish.dart
similarity index 100%
rename from lib/src/domain/monero/mnemonics/spanish.dart
rename to lib/monero/mnemonics/spanish.dart
diff --git a/lib/monero/monero_account_list.dart b/lib/monero/monero_account_list.dart
index cc49af7bb..c8522b59b 100644
--- a/lib/monero/monero_account_list.dart
+++ b/lib/monero/monero_account_list.dart
@@ -1,5 +1,5 @@
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
+import 'package:cake_wallet/monero/account.dart';
 import 'package:cw_monero/account_list.dart' as account_list;
 
 part 'monero_account_list.g.dart';
diff --git a/lib/src/domain/monero/monero_amount_format.dart b/lib/monero/monero_amount_format.dart
similarity index 88%
rename from lib/src/domain/monero/monero_amount_format.dart
rename to lib/monero/monero_amount_format.dart
index baf1a81d5..4693e9fa1 100644
--- a/lib/src/domain/monero/monero_amount_format.dart
+++ b/lib/monero/monero_amount_format.dart
@@ -1,5 +1,5 @@
 import 'package:intl/intl.dart';
-import 'package:cake_wallet/src/domain/common/crypto_amount_format.dart';
+import 'package:cake_wallet/entities/crypto_amount_format.dart';
 
 const moneroAmountLength = 12;
 const moneroAmountDivider = 1000000000000;
diff --git a/lib/monero/monero_balance.dart b/lib/monero/monero_balance.dart
index 6496e347d..c3cca86a7 100644
--- a/lib/monero/monero_balance.dart
+++ b/lib/monero/monero_balance.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/monero/monero_amount_format.dart';
+import 'package:cake_wallet/monero/monero_amount_format.dart';
 
 class MoneroBalance {
   MoneroBalance({@required this.fullBalance, @required this.unlockedBalance})
diff --git a/lib/monero/monero_subaddress_list.dart b/lib/monero/monero_subaddress_list.dart
index 286a26704..14df05912 100644
--- a/lib/monero/monero_subaddress_list.dart
+++ b/lib/monero/monero_subaddress_list.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/services.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_monero/subaddress_list.dart' as subaddress_list;
-import 'package:cake_wallet/src/domain/monero/subaddress.dart';
+import 'package:cake_wallet/monero/subaddress.dart';
 
 part 'monero_subaddress_list.g.dart';
 
diff --git a/lib/src/domain/monero/monero_transaction_creation_credentials.dart b/lib/monero/monero_transaction_creation_credentials.dart
similarity index 65%
rename from lib/src/domain/monero/monero_transaction_creation_credentials.dart
rename to lib/monero/monero_transaction_creation_credentials.dart
index 9df8a105d..312b37401 100644
--- a/lib/src/domain/monero/monero_transaction_creation_credentials.dart
+++ b/lib/monero/monero_transaction_creation_credentials.dart
@@ -1,5 +1,5 @@
-import 'package:cake_wallet/src/domain/common/transaction_creation_credentials.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/entities/transaction_creation_credentials.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
 
 class MoneroTransactionCreationCredentials
     extends TransactionCreationCredentials {
diff --git a/lib/monero/monero_transaction_history.dart b/lib/monero/monero_transaction_history.dart
index cd3484389..42c9a682b 100644
--- a/lib/monero/monero_transaction_history.dart
+++ b/lib/monero/monero_transaction_history.dart
@@ -3,8 +3,8 @@ import 'package:mobx/mobx.dart';
 import 'package:cw_monero/transaction_history.dart'
     as monero_transaction_history;
 import 'package:cake_wallet/core/transaction_history.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
-import 'package:cake_wallet/src/domain/monero/monero_transaction_info.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
+import 'package:cake_wallet/monero/monero_transaction_info.dart';
 
 part 'monero_transaction_history.g.dart';
 
diff --git a/lib/src/domain/monero/monero_transaction_info.dart b/lib/monero/monero_transaction_info.dart
similarity index 82%
rename from lib/src/domain/monero/monero_transaction_info.dart
rename to lib/monero/monero_transaction_info.dart
index 682727406..7b05a9598 100644
--- a/lib/src/domain/monero/monero_transaction_info.dart
+++ b/lib/monero/monero_transaction_info.dart
@@ -1,9 +1,9 @@
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
-import 'package:cake_wallet/src/domain/monero/monero_amount_format.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
+import 'package:cake_wallet/monero/monero_amount_format.dart';
 import 'package:cw_monero/structs/transaction_info_row.dart';
-import 'package:cake_wallet/src/domain/common/parseBoolFromString.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
-import 'package:cake_wallet/src/domain/common/format_amount.dart';
+import 'package:cake_wallet/entities/parseBoolFromString.dart';
+import 'package:cake_wallet/entities/transaction_direction.dart';
+import 'package:cake_wallet/entities/format_amount.dart';
 
 class MoneroTransactionInfo extends TransactionInfo {
   MoneroTransactionInfo(this.id, this.height, this.direction, this.date,
diff --git a/lib/monero/monero_wallet.dart b/lib/monero/monero_wallet.dart
index bf01d0ec7..1d3455994 100644
--- a/lib/monero/monero_wallet.dart
+++ b/lib/monero/monero_wallet.dart
@@ -1,5 +1,5 @@
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
-import 'package:cake_wallet/src/domain/monero/monero_transaction_creation_credentials.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
+import 'package:cake_wallet/monero/monero_transaction_creation_credentials.dart';
 import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_monero/wallet.dart';
@@ -10,12 +10,12 @@ import 'package:cake_wallet/monero/monero_transaction_history.dart';
 import 'package:cake_wallet/monero/monero_subaddress_list.dart';
 import 'package:cake_wallet/monero/monero_account_list.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
-import 'package:cake_wallet/src/domain/monero/subaddress.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+import 'package:cake_wallet/monero/account.dart';
+import 'package:cake_wallet/monero/subaddress.dart';
+import 'package:cake_wallet/entities/node.dart';
 import 'package:cake_wallet/core/pending_transaction.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
 
 part 'monero_wallet.g.dart';
 
@@ -186,6 +186,11 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance> with Store {
     await walletInfo.save();
   }
 
+  @override
+  Future<void> rescan({int height}) async {
+    // FIXME: Unimplemented
+  }
+
   void _setListeners() {
     _listener?.stop();
     _listener = monero_wallet.setListeners(
@@ -199,7 +204,6 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance> with Store {
     }
 
     final currentHeight = getCurrentHeight();
-    print('currentHeight $currentHeight');
 
     if (currentHeight <= 1) {
       final height = _getHeightByDate(walletInfo.date);
diff --git a/lib/monero/monero_wallet_service.dart b/lib/monero/monero_wallet_service.dart
index 637646f2a..d16a8f271 100644
--- a/lib/monero/monero_wallet_service.dart
+++ b/lib/monero/monero_wallet_service.dart
@@ -6,9 +6,9 @@ import 'package:cw_monero/wallet.dart' as monero_wallet;
 import 'package:cake_wallet/monero/monero_wallet.dart';
 import 'package:cake_wallet/core/wallet_credentials.dart';
 import 'package:cake_wallet/core/wallet_service.dart';
-import 'package:cake_wallet/src/domain/common/pathForWallet.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/pathForWallet.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 class MoneroNewWalletCredentials extends WalletCredentials {
   MoneroNewWalletCredentials({String name, String password, this.language})
diff --git a/lib/src/domain/monero/subaddress.dart b/lib/monero/subaddress.dart
similarity index 100%
rename from lib/src/domain/monero/subaddress.dart
rename to lib/monero/subaddress.dart
diff --git a/lib/reactions/bootstrap.dart b/lib/reactions/bootstrap.dart
index a92ed01b8..70904d1ef 100644
--- a/lib/reactions/bootstrap.dart
+++ b/lib/reactions/bootstrap.dart
@@ -1,139 +1,34 @@
 import 'dart:async';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/di.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:connectivity/connectivity.dart';
-import 'package:cake_wallet/core/key_service.dart';
-import 'package:cake_wallet/router.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/core/wallet_service.dart';
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/reactions/on_authentication_state_change.dart';
+import 'package:cake_wallet/reactions/on_current_fiat_change.dart';
+import 'package:cake_wallet/reactions/on_current_wallet_change.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/services/fiat_convertation_service.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/store/dashboard/fiat_convertation_store.dart';
+import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 
-// FIXME: move me
-Future<void> loadCurrentWallet() async {
+Future<void> bootstrap(GlobalKey<NavigatorState> navigatorKey) async {
   final appStore = getIt.get<AppStore>();
-  final name = getIt.get<SharedPreferences>().getString('current_wallet_name');
-  final typeRaw =
-      getIt.get<SharedPreferences>().getInt('current_wallet_type') ?? 0;
-  final type = deserializeFromInt(typeRaw);
-  final password =
-      await getIt.get<KeyService>().getWalletPassword(walletName: name);
-  final _service = getIt.get<WalletService>(param1: type);
-  final wallet = await _service.openWallet(name, password);
-  appStore.wallet = wallet;
-}
-
-ReactionDisposer _initialAuthReaction;
-ReactionDisposer _onCurrentWalletChangeReaction;
-ReactionDisposer _onWalletSyncStatusChangeReaction;
-ReactionDisposer _onCurrentFiatCurrencyChangeDisposer;
-Timer _reconnectionTimer;
-
-Future<void> bootstrap(
-    {FiatConvertationService fiatConvertationService,
-    GlobalKey<NavigatorState> navigatorKey}) async {
   final authenticationStore = getIt.get<AuthenticationStore>();
   final settingsStore = getIt.get<SettingsStore>();
-  final fiatConvertationStore = getIt.get<FiatConvertationStore>();
+  final fiatConversionStore = getIt.get<FiatConversionStore>();
 
   if (authenticationStore.state == AuthenticationState.uninitialized) {
-    authenticationStore.state =
-        getIt.get<SharedPreferences>().getString('current_wallet_name') == null
-            ? AuthenticationState.denied
-            : AuthenticationState.installed;
+    authenticationStore.state = getIt
+                .get<SharedPreferences>()
+                .getString(PreferencesKey.currentWalletName) ==
+            null
+        ? AuthenticationState.denied
+        : AuthenticationState.installed;
   }
 
-  _initialAuthReaction ??= autorun((_) async {
-    final state = authenticationStore.state;
-    print(state);
-
-    if (state == AuthenticationState.installed) {
-      await loadCurrentWallet();
-      await navigatorKey.currentState
-          .pushAndRemoveUntil(createLoginRoute(), (_) => false);
-    }
-
-    if (state == AuthenticationState.allowed) {
-      await navigatorKey.currentState
-          .pushAndRemoveUntil(createDashboardRoute(), (_) => false);
-    }
-
-    if (state == AuthenticationState.denied) {
-      await navigatorKey.currentState
-          .pushAndRemoveUntil(createWelcomeRoute(), (_) => false);
-    }
-  });
-
-  _onCurrentWalletChangeReaction ??=
-      reaction((_) => getIt.get<AppStore>().wallet, (WalletBase wallet) async {
-    _onWalletSyncStatusChangeReaction?.reaction?.dispose();
-    _reconnectionTimer?.cancel();
-    _onWalletSyncStatusChangeReaction =
-        reaction((_) => wallet.syncStatus, (SyncStatus status) async {
-      if (status is ConnectedSyncStatus) {
-        await wallet.startSync();
-      }
-    });
-
-    _reconnectionTimer = Timer.periodic(Duration(seconds: 5), (_) async {
-      final connectivityResult = await (Connectivity().checkConnectivity());
-
-      if (connectivityResult == ConnectivityResult.none) {
-        wallet.syncStatus = FailedSyncStatus();
-        return;
-      }
-
-      if (wallet.syncStatus is LostConnectionSyncStatus ||
-          wallet.syncStatus is FailedSyncStatus) {
-        try {
-          final alive =
-              await settingsStore.getCurrentNode(wallet.type).requestNode();
-
-          if (alive) {
-            await wallet.connectToNode(
-                node: settingsStore.getCurrentNode(wallet.type));
-          }
-        } catch (_) {}
-      }
-    });
-
-    await getIt
-        .get<SharedPreferences>()
-        .setString('current_wallet_name', wallet.name);
-
-    await getIt
-        .get<SharedPreferences>()
-        .setInt('current_wallet_type', serializeToInt(wallet.type));
-
-    final node = settingsStore.getCurrentNode(wallet.type);
-    final cryptoCurrency = wallet.currency;
-    final fiatCurrency = settingsStore.fiatCurrency;
-
-    await wallet.connectToNode(node: node);
-
-    final price = await fiatConvertationService.getPrice(
-        crypto: cryptoCurrency, fiat: fiatCurrency);
-
-    fiatConvertationStore.setPrice(price);
-  });
-
-  _onCurrentFiatCurrencyChangeDisposer ??= reaction(
-      (_) => settingsStore.fiatCurrency, (FiatCurrency fiatCurrency) async {
-    final cryptoCurrency = getIt.get<AppStore>().wallet.currency;
-
-    final price = await fiatConvertationService.getPrice(
-        crypto: cryptoCurrency, fiat: fiatCurrency);
-
-    fiatConvertationStore.setPrice(price);
-  });
+  startAuthenticationStateChange(authenticationStore, navigatorKey);
+  startCurrentWalletChangeReaction(
+      appStore, settingsStore, fiatConversionStore);
+  startCurrentFiatChangeReaction(appStore, settingsStore);
 }
diff --git a/lib/reactions/check_connection.dart b/lib/reactions/check_connection.dart
new file mode 100644
index 000000000..f89943856
--- /dev/null
+++ b/lib/reactions/check_connection.dart
@@ -0,0 +1,35 @@
+import 'dart:async';
+
+import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:connectivity/connectivity.dart';
+
+Timer _checkConnectionTimer;
+
+void startCheckConnectionReaction(WalletBase wallet, SettingsStore settingsStore, {int timeInterval = 5}) {
+  _checkConnectionTimer?.cancel();
+  _checkConnectionTimer = Timer.periodic(Duration(seconds: timeInterval), (_) async {
+    final connectivityResult = await (Connectivity().checkConnectivity());
+
+    if (connectivityResult == ConnectivityResult.none) {
+      wallet.syncStatus = FailedSyncStatus();
+      return;
+    }
+
+    if (wallet.syncStatus is LostConnectionSyncStatus ||
+        wallet.syncStatus is FailedSyncStatus) {
+      try {
+        final alive =
+            await settingsStore.getCurrentNode(wallet.type).requestNode();
+
+        if (alive) {
+          await wallet.connectToNode(
+              node: settingsStore.getCurrentNode(wallet.type));
+        }
+      } catch (_) {
+        // FIXME: empty catch clojure
+      }
+    }
+  });
+}
diff --git a/lib/reactions/fiat_rate_update.dart b/lib/reactions/fiat_rate_update.dart
new file mode 100644
index 000000000..7d2f1a097
--- /dev/null
+++ b/lib/reactions/fiat_rate_update.dart
@@ -0,0 +1,23 @@
+import 'dart:async';
+import 'package:cake_wallet/core/fiat_conversion_service.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+
+Timer _timer;
+
+Future<void> startFiatRateUpdate(AppStore appStore, SettingsStore settingsStore,
+    FiatConversionStore fiatConversionStore) async {
+  if (_timer != null) {
+    return;
+  }
+
+  fiatConversionStore.price = await FiatConversionService.fetchPrice(
+      appStore.wallet.currency, settingsStore.fiatCurrency);
+
+  _timer = Timer.periodic(
+      Duration(seconds: 30),
+      (_) async => fiatConversionStore.price =
+          await FiatConversionService.fetchPrice(
+              appStore.wallet.currency, settingsStore.fiatCurrency));
+}
diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart
new file mode 100644
index 000000000..237ef00a8
--- /dev/null
+++ b/lib/reactions/on_authentication_state_change.dart
@@ -0,0 +1,31 @@
+import 'package:cake_wallet/routes.dart';
+import 'package:flutter/widgets.dart';
+import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/router.dart';
+import 'package:cake_wallet/entities/load_current_wallet.dart';
+import 'package:cake_wallet/store/authentication_store.dart';
+
+ReactionDisposer _onAuthenticationStateChange;
+
+void startAuthenticationStateChange(AuthenticationStore authenticationStore,
+    GlobalKey<NavigatorState> navigatorKey) {
+  _onAuthenticationStateChange ??= autorun((_) async {
+    final state = authenticationStore.state;
+
+    if (state == AuthenticationState.installed) {
+      await loadCurrentWallet();
+      // await navigatorKey.currentState
+      //     .pushNamedAndRemoveUntil(Routes.login, (_) => false);
+    }
+
+    if (state == AuthenticationState.allowed) {
+      await navigatorKey.currentState
+          .pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
+    }
+
+    if (state == AuthenticationState.denied) {
+      await navigatorKey.currentState
+          .pushNamedAndRemoveUntil(Routes.welcome, (_) => false);
+    }
+  });
+}
diff --git a/lib/reactions/on_current_fiat_change.dart b/lib/reactions/on_current_fiat_change.dart
new file mode 100644
index 000000000..50207b748
--- /dev/null
+++ b/lib/reactions/on_current_fiat_change.dart
@@ -0,0 +1,18 @@
+import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+
+ReactionDisposer _onCurrentFiatCurrencyChangeDisposer;
+
+void startCurrentFiatChangeReaction(AppStore appStore, SettingsStore settingsStore) {
+  _onCurrentFiatCurrencyChangeDisposer?.reaction?.dispose();
+  _onCurrentFiatCurrencyChangeDisposer = reaction(
+          (_) => settingsStore.fiatCurrency, (FiatCurrency fiatCurrency) async {
+    final cryptoCurrency = appStore.wallet.currency;
+    // final price = await fiatConvertationService.getPrice(
+    //     crypto: cryptoCurrency, fiat: fiatCurrency);
+    //
+    // fiatConvertationStore.setPrice(price);
+  });
+}
\ No newline at end of file
diff --git a/lib/reactions/on_current_wallet_change.dart b/lib/reactions/on_current_wallet_change.dart
new file mode 100644
index 000000000..6b9b447b6
--- /dev/null
+++ b/lib/reactions/on_current_wallet_change.dart
@@ -0,0 +1,39 @@
+import 'package:mobx/mobx.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/reactions/check_connection.dart';
+import 'package:cake_wallet/reactions/on_wallet_sync_status_change.dart';
+import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/core/fiat_conversion_service.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+
+ReactionDisposer _onCurrentWalletChangeReaction;
+
+void startCurrentWalletChangeReaction(AppStore appStore,
+    SettingsStore settingsStore, FiatConversionStore fiatConversionStore) {
+  _onCurrentWalletChangeReaction?.reaction?.dispose();
+
+  _onCurrentWalletChangeReaction =
+      reaction((_) => appStore.wallet, (WalletBase wallet) async {
+    try {
+      final node = settingsStore.getCurrentNode(wallet.type);
+      startWalletSyncStatusChangeReaction(wallet);
+      startCheckConnectionReaction(wallet, settingsStore);
+      await getIt
+          .get<SharedPreferences>()
+          .setString(PreferencesKey.currentWalletName, wallet.name);
+      await getIt.get<SharedPreferences>().setInt(
+          PreferencesKey.currentWalletType, serializeToInt(wallet.type));
+      await wallet.connectToNode(node: node);
+
+      fiatConversionStore.price = await FiatConversionService.fetchPrice(
+          wallet.currency, settingsStore.fiatCurrency);
+    } catch (e) {
+      print(e.toString());
+    }
+  });
+}
diff --git a/lib/reactions/on_wallet_sync_status_change.dart b/lib/reactions/on_wallet_sync_status_change.dart
new file mode 100644
index 000000000..0a10505c1
--- /dev/null
+++ b/lib/reactions/on_wallet_sync_status_change.dart
@@ -0,0 +1,15 @@
+import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+
+ReactionDisposer _onWalletSyncStatusChangeReaction;
+
+void startWalletSyncStatusChangeReaction(WalletBase wallet) {
+  _onWalletSyncStatusChangeReaction?.reaction?.dispose();
+  _onWalletSyncStatusChangeReaction =
+      reaction((_) => wallet.syncStatus, (SyncStatus status) async {
+        if (status is ConnectedSyncStatus) {
+          await wallet.startSync();
+        }
+      });
+}
\ No newline at end of file
diff --git a/lib/router.dart b/lib/router.dart
index 48adcd3ed..e7f9330d8 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -1,62 +1,18 @@
-import 'package:cake_wallet/src/screens/dashboard/dashboard_page.dart';
-import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/utils/language_list.dart';
 import 'package:cake_wallet/view_model/wallet_new_vm.dart';
 import 'package:cake_wallet/view_model/wallet_restoration_from_seed_vm.dart';
 import 'package:cake_wallet/view_model/wallet_restoration_from_keys_vm.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:provider/provider.dart';
-import 'package:hive/hive.dart';
-import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'di.dart';
-// MARK: Import domains
-
-import 'package:cake_wallet/src/domain/common/contact.dart';
-import 'package:cake_wallet/src/domain/services/user_service.dart';
-import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/changenow/changenow_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/monero/transaction_description.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
-import 'package:cake_wallet/src/domain/common/mnemonic_item.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
-import 'package:cake_wallet/src/domain/monero/subaddress.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-
-// MARK: Import stores
-
-import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
-import 'package:cake_wallet/src/stores/node_list/node_list_store.dart';
-import 'package:cake_wallet/src/stores/auth/auth_store.dart';
-import 'package:cake_wallet/src/stores/balance/balance_store.dart';
-import 'package:cake_wallet/src/stores/send/send_store.dart';
-import 'package:cake_wallet/src/stores/subaddress_creation/subaddress_creation_store.dart';
-import 'package:cake_wallet/src/stores/subaddress_list/subaddress_list_store.dart';
-import 'package:cake_wallet/src/stores/sync/sync_store.dart';
-import 'package:cake_wallet/src/stores/user/user_store.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/stores/wallet_creation/wallet_creation_store.dart';
-import 'package:cake_wallet/src/stores/wallet_list/wallet_list_store.dart';
-import 'package:cake_wallet/src/stores/wallet_restoration/wallet_restoration_store.dart';
-import 'package:cake_wallet/src/stores/account_list/account_list_store.dart';
-import 'package:cake_wallet/src/stores/address_book/address_book_store.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_keys_store.dart';
-import 'package:cake_wallet/src/stores/exchange_trade/exchange_trade_store.dart';
-import 'package:cake_wallet/src/stores/exchange/exchange_store.dart';
-import 'package:cake_wallet/src/stores/rescan/rescan_wallet_store.dart';
-import 'package:cake_wallet/src/stores/price/price_store.dart';
-
-// MARK: Import screens
-
+import 'package:cake_wallet/entities/contact.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/src/screens/dashboard/dashboard_page.dart';
+import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 import 'package:cake_wallet/src/screens/nodes/node_create_or_edit_page.dart';
 import 'package:cake_wallet/src/screens/nodes/nodes_list_page.dart';
@@ -77,9 +33,6 @@ import 'package:cake_wallet/src/screens/monero_accounts/monero_account_edit_or_c
 import 'package:cake_wallet/src/screens/contact/contact_list_page.dart';
 import 'package:cake_wallet/src/screens/contact/contact_page.dart';
 import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
-import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dart';
-import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart';
-import 'package:cake_wallet/src/screens/subaddress/subaddress_list_page.dart';
 import 'package:cake_wallet/src/screens/settings/change_language.dart';
 import 'package:cake_wallet/src/screens/restore/restore_wallet_from_seed_details.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_page.dart';
@@ -87,63 +40,31 @@ import 'package:cake_wallet/src/screens/settings/settings.dart';
 import 'package:cake_wallet/src/screens/rescan/rescan_page.dart';
 import 'package:cake_wallet/src/screens/faq/faq_page.dart';
 import 'package:cake_wallet/src/screens/trade_details/trade_details_page.dart';
-import 'package:cake_wallet/src/screens/auth/create_unlock_page.dart';
-import 'package:cake_wallet/src/screens/auth/create_login_page.dart';
-import 'package:cake_wallet/src/screens/dashboard/create_dashboard_page.dart';
 import 'package:cake_wallet/src/screens/welcome/create_welcome_page.dart';
 import 'package:cake_wallet/src/screens/new_wallet/new_wallet_type_page.dart';
 import 'package:cake_wallet/src/screens/send/send_template_page.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_template_page.dart';
-
-CupertinoPageRoute<void> createDashboardRoute() =>
-    CupertinoPageRoute<void>(builder: (_) => getIt.get<DashboardPage>());
-
-CupertinoPageRoute<void> createLoginRoute() => CupertinoPageRoute<void>(
-    builder: (context) => getIt.get<AuthPage>(instanceName: 'login'));
-
-MaterialPageRoute<void> createWelcomeRoute() =>
-    MaterialPageRoute<void>(builder: (_) => createWelcomePage());
+import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dart';
+import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart';
 
 class Router {
-  static Route<dynamic> generateRoute(
-      {SharedPreferences sharedPreferences,
-      WalletListService walletListService,
-      WalletService walletService,
-      UserService userService,
-      RouteSettings settings,
-      PriceStore priceStore,
-      WalletStore walletStore,
-      SyncStore syncStore,
-      BalanceStore balanceStore,
-      SettingsStore settingsStore,
-      Box<Contact> contacts,
-      Box<Node> nodes,
-      Box<TransactionDescription> transactionDescriptions,
-      Box<Trade> trades}) {
+  static Route<dynamic> generateRoute(RouteSettings settings) {
     switch (settings.name) {
       case Routes.welcome:
         return MaterialPageRoute<void>(builder: (_) => createWelcomePage());
 
       case Routes.newWalletFromWelcome:
-        final type = settings.arguments as WalletType;
-        walletListService.changeWalletManger(walletType: type);
-
         return CupertinoPageRoute<void>(
-            builder: (_) => Provider(
-                create: (_) => UserStore(
-                    accountService: UserService(
-                        secureStorage: FlutterSecureStorage(),
-                        sharedPreferences: sharedPreferences)),
-                child: SetupPinCodePage(
-                    onPinCodeSetup: (context, _) =>
-                        Navigator.pushNamed(context, Routes.newWalletType))));
+            builder: (_) => getIt.get<SetupPinCodePage>(
+                param1: (BuildContext context, dynamic _) =>
+                    Navigator.pushNamed(context, Routes.newWalletType)),
+            fullscreenDialog: true);
 
       case Routes.newWalletType:
         return CupertinoPageRoute<void>(
             builder: (_) => NewWalletTypePage(
-                  onTypeSelected: (context, type) => Navigator.of(context)
-                      .pushNamed(Routes.newWallet, arguments: type),
-                ));
+                onTypeSelected: (context, type) => Navigator.of(context)
+                    .pushNamed(Routes.newWallet, arguments: type)));
 
       case Routes.newWallet:
         final type = settings.arguments as WalletType;
@@ -160,15 +81,7 @@ class Router {
         }
 
         return CupertinoPageRoute<void>(
-            builder: (_) => Provider(
-                create: (_) => UserStore(
-                    accountService: UserService(
-                        secureStorage: FlutterSecureStorage(),
-                        sharedPreferences: sharedPreferences)),
-                child: SetupPinCodePage(
-                    onPinCodeSetup: (context, pin) =>
-                        callback == null ? null : callback(context, pin))),
-            fullscreenDialog: true);
+            builder: (_) => getIt.get<SetupPinCodePage>(param1: callback));
 
       case Routes.restoreWalletType:
         return CupertinoPageRoute<void>(
@@ -180,14 +93,11 @@ class Router {
 
       case Routes.restoreOptions:
         final type = settings.arguments as WalletType;
-        walletListService.changeWalletManger(walletType: type);
-
         return CupertinoPageRoute<void>(
             builder: (_) => RestoreOptionsPage(type: type));
 
       case Routes.restoreWalletOptions:
         final type = settings.arguments as WalletType;
-        walletListService.changeWalletManger(walletType: type);
 
         return CupertinoPageRoute<void>(
             builder: (_) => RestoreWalletOptionsPage(
@@ -215,26 +125,22 @@ class Router {
 
       case Routes.restoreWalletOptionsFromWelcome:
         return CupertinoPageRoute<void>(
-            builder: (_) => Provider(
-                create: (_) => UserStore(
-                    accountService: UserService(
-                        secureStorage: FlutterSecureStorage(),
-                        sharedPreferences: sharedPreferences)),
-                child: SetupPinCodePage(
-                    onPinCodeSetup: (context, _) => Navigator.pushNamed(
-                        context, Routes.restoreWalletType))));
+            builder: (_) => getIt.get<SetupPinCodePage>(
+                param1: (BuildContext context, dynamic _) =>
+                    Navigator.pushNamed(context, Routes.restoreWalletType)),
+            fullscreenDialog: true);
 
       case Routes.seed:
         return MaterialPageRoute<void>(
-            builder: (_) => getIt.get<WalletSeedPage>(
-                param1: settings.arguments as bool));
+            builder: (_) =>
+                getIt.get<WalletSeedPage>(param1: settings.arguments as bool));
 
       case Routes.restoreWalletFromSeed:
         final args = settings.arguments as List<dynamic>;
         final type = args.first as WalletType;
         final language = type == WalletType.monero
             ? args[1] as String
-            : 'English'; // FIXME: Unnamed constant; English default and only one language for bitcoin.
+            : LanguageList.english;
 
         return CupertinoPageRoute<void>(
             builder: (_) =>
@@ -245,7 +151,7 @@ class Router {
         final type = args.first as WalletType;
         final language = type == WalletType.monero
             ? args[1] as String
-            : 'English'; // FIXME: Unnamed constant; English default and only one language for bitcoin.
+            : LanguageList.english;
 
         final walletRestorationFromKeysVM =
             getIt.get<WalletRestorationFromKeysVM>(param1: [type, language]);
@@ -274,8 +180,8 @@ class Router {
       case Routes.transactionDetails:
         return CupertinoPageRoute<void>(
             fullscreenDialog: true,
-            builder: (_) => TransactionDetailsPage(
-                transactionInfo: settings.arguments as TransactionInfo));
+            builder: (_) =>
+                TransactionDetailsPage(settings.arguments as TransactionInfo));
 
       case Routes.newSubaddress:
         return CupertinoPageRoute<void>(
@@ -314,12 +220,8 @@ class Router {
       case Routes.unlock:
         return MaterialPageRoute<void>(
             fullscreenDialog: true,
-            builder: (_) => createUnlockPage(
-                sharedPreferences: sharedPreferences,
-                userService: userService,
-                walletService: walletService,
-                onAuthenticationFinished:
-                    settings.arguments as OnAuthenticationFinished));
+            builder: (_) => getIt.get<AuthPage>(
+                param1: settings.arguments as OnAuthenticationFinished));
 
       case Routes.nodeList:
         return CupertinoPageRoute<void>(
@@ -363,27 +265,9 @@ class Router {
         return MaterialPageRoute<void>(
             builder: (_) => getIt.get<ExchangeConfirmPage>());
 
-      //ExchangeConfirmPage(trade: settings.arguments as Trade));
-
       case Routes.tradeDetails:
-        return MaterialPageRoute<void>(builder: (context) {
-          return MultiProvider(providers: [
-            ProxyProvider<SettingsStore, ExchangeTradeStore>(
-              update: (_, settingsStore, __) => ExchangeTradeStore(
-                  trade: settings.arguments as Trade,
-                  walletStore: walletStore,
-                  trades: trades),
-            )
-          ], child: TradeDetailsPage());
-        });
-
-      case Routes.subaddressList:
-        return MaterialPageRoute<Subaddress>(
-            builder: (_) => MultiProvider(providers: [
-                  Provider(
-                      create: (_) =>
-                          SubaddressListStore(walletService: walletService))
-                ], child: SubaddressListPage()));
+        return MaterialPageRoute<void>(
+            builder: (_) => TradeDetailsPage(settings.arguments as Trade));
 
       case Routes.restoreWalletFromSeedDetails:
         final args = settings.arguments as List;
@@ -407,10 +291,7 @@ class Router {
             builder: (_) => getIt.get<SettingsPage>());
 
       case Routes.rescan:
-        return MaterialPageRoute<void>(
-            builder: (_) => Provider(
-                create: (_) => RescanWalletStore(walletService: walletService),
-                child: RescanPage()));
+        return MaterialPageRoute<void>(builder: (_) => getIt.get<RescanPage>());
 
       case Routes.faq:
         return MaterialPageRoute<void>(builder: (_) => FaqPage());
@@ -421,9 +302,8 @@ class Router {
       default:
         return MaterialPageRoute<void>(
             builder: (_) => Scaffold(
-                  body: Center(
-                      child: Text(S.current.router_no_route(settings.name))),
-                ));
+                body: Center(
+                    child: Text(S.current.router_no_route(settings.name)))));
     }
   }
 }
diff --git a/lib/routes.dart b/lib/routes.dart
index c9db819e8..61af6b26e 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -35,7 +35,6 @@ class Routes {
   static const tradeDetails = '/trade_details';
   static const exchangeFunds = '/exchange_funds';
   static const exchangeTrade = '/exchange_trade';
-  static const subaddressList = '/subaddress_list';
   static const restoreWalletFromSeedDetails = '/restore_from_seed_details';
   static const exchange = '/exchange';
   static const settings = '/settings';
diff --git a/lib/src/domain/bitcoin/bitcoin_amount_format.dart b/lib/src/domain/bitcoin/bitcoin_amount_format.dart
deleted file mode 100644
index de59547bb..000000000
--- a/lib/src/domain/bitcoin/bitcoin_amount_format.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-import 'package:cake_wallet/src/domain/common/crypto_amount_format.dart';
-
-const bitcoinAmountDivider = 100000000;
-
-double bitcoinAmountToDouble({int amount}) =>
-    cryptoAmountToDouble(amount: amount, divider: bitcoinAmountDivider);
-
-int doubleToBitcoinAmount(double amount) =>
-    (amount * bitcoinAmountDivider).toInt();
diff --git a/lib/src/domain/bitcoin_cash/bitcoin_cash_amount_format.dart b/lib/src/domain/bitcoin_cash/bitcoin_cash_amount_format.dart
deleted file mode 100644
index bbb0192c8..000000000
--- a/lib/src/domain/bitcoin_cash/bitcoin_cash_amount_format.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'package:cake_wallet/src/domain/common/crypto_amount_format.dart';
-
-const bitcoinCashAmountDivider = 100000000;
-
-double bitcoinCashAmountToDouble({int amount}) =>
-    cryptoAmountToDouble(amount: amount, divider: bitcoinCashAmountDivider);
\ No newline at end of file
diff --git a/lib/src/domain/dash/dash_amount_format.dart b/lib/src/domain/dash/dash_amount_format.dart
deleted file mode 100644
index 3f1632cd6..000000000
--- a/lib/src/domain/dash/dash_amount_format.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'package:cake_wallet/src/domain/common/crypto_amount_format.dart';
-
-const dashAmountDivider = 100000000;
-
-double dashAmountToDouble({int amount}) =>
-    cryptoAmountToDouble(amount: amount, divider: dashAmountDivider);
\ No newline at end of file
diff --git a/lib/src/domain/ethereum/ethereum_amount_format.dart b/lib/src/domain/ethereum/ethereum_amount_format.dart
deleted file mode 100644
index 644153a22..000000000
--- a/lib/src/domain/ethereum/ethereum_amount_format.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'package:cake_wallet/src/domain/common/crypto_amount_format.dart';
-
-const ethereumAmountDivider = 1000000000000000000;
-
-double ethereumAmountToDouble({num amount}) =>
-    cryptoAmountToDouble(amount: amount, divider: ethereumAmountDivider);
\ No newline at end of file
diff --git a/lib/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart b/lib/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart
deleted file mode 100644
index b150ebce1..000000000
--- a/lib/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart
+++ /dev/null
@@ -1,241 +0,0 @@
-import 'dart:convert';
-import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_not_found_exeption.dart';
-import 'package:flutter/foundation.dart';
-import 'package:http/http.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_pair.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/limits.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_state.dart';
-import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_request.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_not_created_exeption.dart';
-import 'package:cake_wallet/src/domain/monero/monero_amount_format.dart';
-import 'package:cake_wallet/src/domain/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/bitcoin_cash/bitcoin_cash_amount_format.dart';
-import 'package:cake_wallet/src/domain/dash/dash_amount_format.dart';
-import 'package:cake_wallet/src/domain/ethereum/ethereum_amount_format.dart';
-import 'package:cake_wallet/src/domain/litecoin/litecoin_amount_format.dart';
-
-class MorphTokenExchangeProvider extends ExchangeProvider {
-  MorphTokenExchangeProvider({@required this.trades})
-      : super(
-      pairList: [
-        ExchangePair(from: CryptoCurrency.xmr, to: CryptoCurrency.eth),
-        ExchangePair(from: CryptoCurrency.xmr, to: CryptoCurrency.bch),
-        ExchangePair(from: CryptoCurrency.xmr, to: CryptoCurrency.ltc),
-        ExchangePair(from: CryptoCurrency.xmr, to: CryptoCurrency.dash),
-
-        ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.btc),
-        ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.eth),
-        ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.bch),
-        ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.ltc),
-        ExchangePair(from: CryptoCurrency.dash, to: CryptoCurrency.xmr),
-
-        ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.btc),
-        ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.eth),
-        ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.bch),
-        ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.dash),
-        ExchangePair(from: CryptoCurrency.ltc, to: CryptoCurrency.xmr),
-
-        ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.btc),
-        ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.eth),
-        ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.ltc),
-        ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.dash),
-        ExchangePair(from: CryptoCurrency.bch, to: CryptoCurrency.xmr),
-
-        ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.btc),
-        ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.bch),
-        ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.ltc),
-        ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.dash),
-        ExchangePair(from: CryptoCurrency.eth, to: CryptoCurrency.xmr),
-
-        ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.eth),
-        ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.bch),
-        ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.ltc),
-        ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.dash),
-        ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.xmr)
-      ]);
-
-  Box<Trade> trades;
-
-  static const apiUri = 'https://api.morphtoken.com';
-  static const _morphURISuffix = '/morph';
-  static const _limitsURISuffix = '/limits';
-  static const _ratesURISuffix = '/rates';
-  static const weight = 10000;
-
-  @override
-  String get title => 'MorphToken';
-
-  @override
-  ExchangeProviderDescription get description =>
-      ExchangeProviderDescription.morphToken;
-
-  @override
-  Future<Limits> fetchLimits({CryptoCurrency from, CryptoCurrency to}) async {
-    final url = apiUri + _limitsURISuffix;
-    final headers = {'Content-type': 'application/json'};
-    final body =
-    json.encode({
-      "input": {
-        "asset": from.toString()
-      },
-      "output": [{
-        "asset": to.toString(),
-        "weight": weight
-      }]});
-    final response =
-    await post(url, headers: headers, body: body);
-    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
-
-    final min = responseJSON['input']['limits']['min'] as int;
-    int max;
-    double ethMax;
-
-    if (from == CryptoCurrency.eth) {
-      ethMax = responseJSON['input']['limits']['max'] as double;
-    } else {
-      max = responseJSON['input']['limits']['max'] as int;
-    }
-
-    double minFormatted;
-    double maxFormatted;
-
-    switch (from) {
-      case CryptoCurrency.xmr:
-        minFormatted = moneroAmountToDouble(amount: min);
-        maxFormatted = moneroAmountToDouble(amount: max);
-        break;
-      case CryptoCurrency.btc:
-        minFormatted = bitcoinAmountToDouble(amount: min);
-        maxFormatted = bitcoinAmountToDouble(amount: max);
-        break;
-      case CryptoCurrency.bch:
-        minFormatted = bitcoinCashAmountToDouble(amount: min);
-        maxFormatted = bitcoinCashAmountToDouble(amount: max);
-        break;
-      case CryptoCurrency.dash:
-        minFormatted = dashAmountToDouble(amount: min);
-        maxFormatted = dashAmountToDouble(amount: max);
-        break;
-      case CryptoCurrency.eth:
-        minFormatted = ethereumAmountToDouble(amount: min);
-        maxFormatted = ethereumAmountToDouble(amount: ethMax);
-        break;
-      case CryptoCurrency.ltc:
-        minFormatted = litecoinAmountToDouble(amount: min);
-        maxFormatted = litecoinAmountToDouble(amount: max);
-        break;
-    }
-
-    return Limits(min: minFormatted, max: maxFormatted);
-  }
-
-  @override
-  Future<Trade> createTrade({TradeRequest request}) async {
-    const url = apiUri + _morphURISuffix;
-    final _request = request as MorphTokenRequest;
-    final body = {
-      "input": {
-        "asset": _request.from.toString(),
-        "refund": _request.refundAddress
-      },
-      "output": [{
-        "asset": _request.to.toString(),
-        "weight": weight,
-        "address": _request.address
-      }],
-      "tag": "cakewallet"
-    };
-
-    final response = await post(url,
-        headers: {'Content-Type': 'application/json'}, body: json.encode(body));
-
-    if (response.statusCode != 200) {
-      if (response.statusCode == 400) {
-        final responseJSON = json.decode(response.body) as Map<String, dynamic>;
-        final error = responseJSON['description'] as String;
-
-        throw TradeNotCreatedException(description, description: error);
-      }
-
-      throw TradeNotCreatedException(description);
-    }
-
-    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
-    final id = responseJSON['id'] as String;
-
-    return Trade(
-        id: id,
-        provider: description,
-        from: _request.from,
-        to: _request.to,
-        state: TradeState.created,
-        amount: _request.amount,
-        createdAt: DateTime.now());
-  }
-
-  @override
-  Future<Trade> findTradeById({@required String id}) async {
-    final url = apiUri + _morphURISuffix + '/' + id;
-    final response = await get(url);
-
-    if (response.statusCode != 200) {
-      if (response.statusCode == 400) {
-        final responseJSON = json.decode(response.body) as Map<String, dynamic>;
-        final error = responseJSON['description'] as String;
-
-        throw TradeNotFoundException(id,
-            provider: description, description: error);
-      }
-
-      throw TradeNotFoundException(id, provider: description);
-    }
-
-    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
-    final fromCurrency = responseJSON['input']['asset'] as String;
-    final from = CryptoCurrency.fromString(fromCurrency.toLowerCase());
-    final toCurrency = responseJSON['output'][0]['asset'] as String;
-    final to = CryptoCurrency.fromString(toCurrency.toLowerCase());
-    final inputAddress = responseJSON['input']['deposit_address'] as String;
-    final status = responseJSON['state'] as String;
-    final state = TradeState.deserialize(raw: status.toLowerCase());
-
-    String amount = "";
-    for (final trade in trades.values) {
-      if (trade.id == id) {
-        amount = trade.amount;
-        break;
-      }
-    }
-
-    return Trade(
-        id: id,
-        from: from,
-        to: to,
-        provider: description,
-        inputAddress: inputAddress,
-        amount: amount,
-        state: state);
-  }
-
-  @override
-  Future<double> calculateAmount(
-      {CryptoCurrency from, CryptoCurrency to, double amount}) async {
-    final url = apiUri + _ratesURISuffix;
-    final response = await get(url);
-    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
-    final rate = responseJSON['data'][from.toString()][to.toString()] as String;
-
-    try {
-      final estimatedAmount = double.parse(rate) * amount;
-      return estimatedAmount;
-    } catch(e) {
-      return 0.0;
-    }
-  }
-}
diff --git a/lib/src/domain/litecoin/litecoin_amount_format.dart b/lib/src/domain/litecoin/litecoin_amount_format.dart
deleted file mode 100644
index f030f5e34..000000000
--- a/lib/src/domain/litecoin/litecoin_amount_format.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'package:cake_wallet/src/domain/common/crypto_amount_format.dart';
-
-const litecoinAmountDivider = 100000000;
-
-double litecoinAmountToDouble({int amount}) =>
-    cryptoAmountToDouble(amount: amount, divider: litecoinAmountDivider);
\ No newline at end of file
diff --git a/lib/src/domain/monero/account_list.dart b/lib/src/domain/monero/account_list.dart
deleted file mode 100644
index dfec3d384..000000000
--- a/lib/src/domain/monero/account_list.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-import 'package:rxdart/rxdart.dart';
-import 'package:cw_monero/account_list.dart' as account_list;
-import 'package:cake_wallet/src/domain/monero/account.dart';
-
-class AccountList {
-  AccountList() {
-    _isRefreshing = false;
-    _isUpdating = false;
-    _accounts = BehaviorSubject<List<Account>>();
-  }
-
-  Observable<List<Account>> get accounts => _accounts.stream;
-
-  BehaviorSubject<List<Account>> _accounts;
-  bool _isRefreshing;
-  bool _isUpdating;
-
-  Future update() async {
-    if (_isUpdating) {
-      return;
-    }
-
-    try {
-      _isUpdating = true;
-      refresh();
-      final accounts = getAll();
-      _accounts.add(accounts);
-      _isUpdating = false;
-    } catch (e) {
-      _isUpdating = false;
-      rethrow;
-    }
-  }
-
-  List<Account> getAll() {
-    return account_list
-        .getAllAccount()
-        .map((accountRow) => Account.fromRow(accountRow))
-        .toList();
-  }
-
-  Future addAccount({String label}) async {
-    await account_list.addAccount(label: label);
-    await update();
-  }
-
-  Future setLabelSubaddress({int accountIndex, String label}) async {
-    await account_list.setLabelForAccount(
-        accountIndex: accountIndex, label: label);
-    await update();
-  }
-
-  void refresh() {
-    if (_isRefreshing) {
-      return;
-    }
-
-    try {
-      _isRefreshing = true;
-      account_list.refreshAccounts();
-      _isRefreshing = false;
-    } catch (e) {
-      _isRefreshing = false;
-      print(e);
-      rethrow;
-    }
-  }
-}
diff --git a/lib/src/domain/monero/monero_balance.dart b/lib/src/domain/monero/monero_balance.dart
deleted file mode 100644
index aee87fe4e..000000000
--- a/lib/src/domain/monero/monero_balance.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/balance.dart';
-
-class MoneroBalance extends Balance {
-  MoneroBalance({@required this.fullBalance, @required this.unlockedBalance});
-
-  final String fullBalance;
-  final String unlockedBalance;
-}
diff --git a/lib/src/domain/monero/monero_transaction_history.dart b/lib/src/domain/monero/monero_transaction_history.dart
deleted file mode 100644
index c6f4fe0de..000000000
--- a/lib/src/domain/monero/monero_transaction_history.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-import 'dart:core';
-import 'package:cake_wallet/src/domain/monero/monero_transaction_info.dart';
-import 'package:flutter/services.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:cw_monero/transaction_history.dart'
-    as monero_transaction_history;
-import 'package:cake_wallet/src/domain/common/transaction_history.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
-
-List<TransactionInfo> _getAllTransactions(dynamic _) =>
-    monero_transaction_history
-        .getAllTransations()
-        .map((row) => MoneroTransactionInfo.fromRow(row))
-        .toList();
-
-class MoneroTransactionHistory extends TransactionHistory {
-  MoneroTransactionHistory()
-      : _transactions = BehaviorSubject<List<TransactionInfo>>.seeded([]);
-
-  @override
-  Observable<List<TransactionInfo>> get transactions => _transactions.stream;
-
-  final BehaviorSubject<List<TransactionInfo>> _transactions;
-  bool _isUpdating = false;
-  bool _isRefreshing = false;
-  bool _needToCheckForRefresh = false;
-
-  @override
-  Future update() async {
-    if (_isUpdating) {
-      return;
-    }
-
-    try {
-      _isUpdating = true;
-      _transactions.value = await getAll(force: true);
-      _isUpdating = false;
-
-      if (!_needToCheckForRefresh) {
-        _needToCheckForRefresh = true;
-      }
-    } catch (e) {
-      _isUpdating = false;
-      print(e);
-      rethrow;
-    }
-  }
-
-  @override
-  Future<List<TransactionInfo>> getAll({bool force = false}) async {
-    await refresh();
-    return _getAllTransactions(null);
-  }
-
-  Future refresh() async {
-    if (_isRefreshing) {
-      return;
-    }
-
-    try {
-      _isRefreshing = true;
-      monero_transaction_history.refreshTransactions();
-      _isRefreshing = false;
-    } on PlatformException catch (e) {
-      _isRefreshing = false;
-      print(e);
-      rethrow;
-    }
-  }
-}
diff --git a/lib/src/domain/monero/monero_wallet.dart b/lib/src/domain/monero/monero_wallet.dart
deleted file mode 100644
index 1eacfc1c9..000000000
--- a/lib/src/domain/monero/monero_wallet.dart
+++ /dev/null
@@ -1,421 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
-import 'package:hive/hive.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:cw_monero/wallet.dart' as monero_wallet;
-import 'package:cw_monero/transaction_history.dart' as transaction_history;
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/transaction_history.dart';
-import 'package:cake_wallet/src/domain/common/transaction_creation_credentials.dart';
-import 'package:cake_wallet/src/domain/common/pending_transaction.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/monero/monero_amount_format.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
-import 'package:cake_wallet/src/domain/monero/account_list.dart';
-import 'package:cake_wallet/src/domain/monero/subaddress_list.dart';
-import 'package:cake_wallet/src/domain/monero/monero_transaction_creation_credentials.dart';
-import 'package:cake_wallet/src/domain/monero/monero_transaction_history.dart';
-import 'package:cake_wallet/src/domain/monero/subaddress.dart';
-import 'package:cake_wallet/src/domain/common/balance.dart';
-import 'package:cake_wallet/src/domain/monero/monero_balance.dart';
-
-const moneroBlockSize = 1000;
-
-class MoneroWallet extends Wallet {
-  MoneroWallet({this.walletInfoSource, this.walletInfo}) {
-    _cachedBlockchainHeight = 0;
-    _isSaving = false;
-    _lastSaveTime = 0;
-    _lastRefreshTime = 0;
-    _refreshHeight = 0;
-    _lastSyncHeight = 0;
-    _name = BehaviorSubject<String>();
-    _address = BehaviorSubject<String>();
-    _syncStatus = BehaviorSubject<SyncStatus>();
-    _onBalanceChange = BehaviorSubject<MoneroBalance>();
-    _account = BehaviorSubject<Account>()..add(Account(id: 0));
-    _subaddress = BehaviorSubject<Subaddress>();
-    setListeners();
-  }
-
-  static Future<MoneroWallet> createdWallet(
-      {Box<WalletInfo> walletInfoSource,
-      String name,
-      bool isRecovery = false,
-      int restoreHeight = 0}) async {
-    // const type = WalletType.monero;
-    // final id = walletTypeToString(type).toLowerCase() + '_' + name;
-    // final walletInfo = WalletInfo(
-    //     id: id,
-    //     name: name,
-    //     type: type,
-    //     isRecovery: isRecovery,
-    //     restoreHeight: restoreHeight);
-    // await walletInfoSource.add(walletInfo);
-
-    // return await configured(
-    //     walletInfo: walletInfo, walletInfoSource: walletInfoSource);
-    return null;
-  }
-
-  static Future<MoneroWallet> load(
-      Box<WalletInfo> walletInfoSource, String name, WalletType type) async {
-    final id = walletTypeToString(type).toLowerCase() + '_' + name;
-    final walletInfo = walletInfoSource.values
-        .firstWhere((info) => info.id == id, orElse: () => null);
-    return await configured(
-        walletInfoSource: walletInfoSource, walletInfo: walletInfo);
-  }
-
-  static Future<MoneroWallet> configured(
-      {@required Box<WalletInfo> walletInfoSource,
-      @required WalletInfo walletInfo}) async {
-    final wallet = MoneroWallet(
-        walletInfoSource: walletInfoSource, walletInfo: walletInfo);
-
-    if (walletInfo.isRecovery) {
-      wallet.setRecoveringFromSeed();
-
-      if (walletInfo.restoreHeight != null) {
-        wallet.setRefreshFromBlockHeight(height: walletInfo.restoreHeight);
-      }
-    }
-
-    return wallet;
-  }
-
-  @override
-  String get address => _address.value;
-
-  @override
-  String get name => _name.value;
-
-  @override
-  WalletType getType() => WalletType.monero;
-
-  @override
-  Observable<SyncStatus> get syncStatus => _syncStatus.stream;
-
-  @override
-  Observable<Balance> get onBalanceChange => _onBalanceChange.stream;
-
-  @override
-  Observable<String> get onNameChange => _name.stream;
-
-  @override
-  Observable<String> get onAddressChange => _address.stream;
-
-  Observable<Account> get onAccountChange => _account.stream;
-
-  Observable<Subaddress> get subaddress => _subaddress.stream;
-
-  bool get isRecovery => walletInfo.isRecovery;
-
-  Account get account => _account.value;
-
-  Box<WalletInfo> walletInfoSource;
-  WalletInfo walletInfo;
-
-  BehaviorSubject<Account> _account;
-  BehaviorSubject<MoneroBalance> _onBalanceChange;
-  BehaviorSubject<SyncStatus> _syncStatus;
-  BehaviorSubject<String> _name;
-  BehaviorSubject<String> _address;
-  BehaviorSubject<Subaddress> _subaddress;
-  int _cachedBlockchainHeight;
-  bool _isSaving;
-  int _lastSaveTime;
-  int _lastRefreshTime;
-  int _refreshHeight;
-  int _lastSyncHeight;
-
-  TransactionHistory _cachedTransactionHistory;
-  SubaddressList _cachedSubaddressList;
-  AccountList _cachedAccountList;
-
-  @override
-  Future updateInfo() async {
-    _name.value = await getName();
-    final acccountList = getAccountList()..refresh();
-    _account.value = acccountList.getAll().first;
-    final subaddressList = getSubaddress();
-    subaddressList.refresh(
-        accountIndex: _account.value != null ? _account.value.id : 0);
-    final subaddresses = subaddressList.getAll();
-    _subaddress.value = subaddresses.first;
-    _address.value = await getAddress();
-  }
-
-  @override
-  Future<String> getFilename() async => monero_wallet.getFilename();
-
-  @override
-  Future<String> getName() async => getFilename()
-      .then((filename) => filename.split('/'))
-      .then((splitted) => splitted.last);
-
-  @override
-  Future<String> getAddress() async => monero_wallet.getAddress(
-      accountIndex: _account.value.id, addressIndex: _subaddress.value.id);
-
-  @override
-  Future<String> getSeed() async => monero_wallet.getSeed();
-
-  @override
-  Future<String> getFullBalance() async => moneroAmountToString(
-      amount: monero_wallet.getFullBalance(accountIndex: _account.value.id));
-
-  @override
-  Future<String> getUnlockedBalance() async => moneroAmountToString(
-      amount:
-          monero_wallet.getUnlockedBalance(accountIndex: _account.value.id));
-
-  @override
-  Future<int> getCurrentHeight() async => monero_wallet.getCurrentHeight();
-
-  @override
-  Future<int> getNodeHeight() async => monero_wallet.getNodeHeight();
-
-  @override
-  Future<bool> isConnected() async => monero_wallet.isConnected();
-
-  @override
-  Future<Map<String, String>> getKeys() async => {
-        'publicViewKey': monero_wallet.getPublicViewKey(),
-        'privateViewKey': monero_wallet.getSecretViewKey(),
-        'publicSpendKey': monero_wallet.getPublicSpendKey(),
-        'privateSpendKey': monero_wallet.getSecretSpendKey()
-      };
-
-  @override
-  TransactionHistory getHistory() {
-    if (_cachedTransactionHistory == null) {
-      _cachedTransactionHistory = MoneroTransactionHistory();
-    }
-
-    return _cachedTransactionHistory;
-  }
-
-  SubaddressList getSubaddress() {
-    if (_cachedSubaddressList == null) {
-      _cachedSubaddressList = SubaddressList();
-    }
-
-    return _cachedSubaddressList;
-  }
-
-  AccountList getAccountList() {
-    if (_cachedAccountList == null) {
-      _cachedAccountList = AccountList();
-    }
-
-    return _cachedAccountList;
-  }
-
-  @override
-  Future close() async {
-//    monero_wallet.closeListeners();
-    monero_wallet.closeCurrentWallet();
-    await _name.close();
-    await _address.close();
-    await _subaddress.close();
-  }
-
-  @override
-  Future connectToNode(
-      {Node node, bool useSSL = false, bool isLightWallet = false}) async {
-    try {
-      _syncStatus.value = ConnectingSyncStatus();
-      await monero_wallet.setupNode(
-          address: node.uri,
-          login: node.login,
-          password: node.password,
-          useSSL: useSSL,
-          isLightWallet: isLightWallet);
-      _syncStatus.value = ConnectedSyncStatus();
-    } catch (e) {
-      _syncStatus.value = FailedSyncStatus();
-      print(e);
-    }
-  }
-
-  @override
-  Future startSync() async {
-    try {
-      _syncStatus.value = StartingSyncStatus();
-      monero_wallet.startRefresh();
-    } on PlatformException catch (e) {
-      _syncStatus.value = FailedSyncStatus();
-      print(e);
-      rethrow;
-    }
-  }
-
-  Future askForSave() async {
-    final diff = DateTime.now().millisecondsSinceEpoch - _lastSaveTime;
-
-    if (_lastSaveTime != 0 && diff < 120000) {
-      return;
-    }
-
-    await store();
-  }
-
-  Future<int> getNodeHeightOrUpdate(int baseHeight) async {
-    if (_cachedBlockchainHeight < baseHeight) {
-      _cachedBlockchainHeight = await getNodeHeight();
-    }
-
-    return _cachedBlockchainHeight;
-  }
-
-  @override
-  Future<PendingTransaction> createTransaction(
-      TransactionCreationCredentials credentials) async {
-    final _credentials = credentials as MoneroTransactionCreationCredentials;
-    final transactionDescription = await transaction_history.createTransaction(
-        address: _credentials.address,
-        paymentId: _credentials.paymentId,
-        amount: _credentials.amount,
-        priorityRaw: _credentials.priority.serialize(),
-        accountIndex: _account.value.id);
-
-    return PendingTransaction.fromTransactionDescription(
-        transactionDescription);
-  }
-
-  @override
-  Future rescan({int restoreHeight = 0}) async {
-    _syncStatus.value = StartingSyncStatus();
-    setRefreshFromBlockHeight(height: restoreHeight);
-    monero_wallet.rescanBlockchainAsync();
-    _syncStatus.value = StartingSyncStatus();
-  }
-
-  void setRecoveringFromSeed() =>
-      monero_wallet.setRecoveringFromSeed(isRecovery: true);
-
-  void setRefreshFromBlockHeight({int height}) =>
-      monero_wallet.setRefreshFromBlockHeight(height: height);
-
-  Future setAsRecovered() async {
-    walletInfo.isRecovery = false;
-    await walletInfo.save();
-  }
-
-  Future askForUpdateBalance() async {
-    final fullBalance = await getFullBalance();
-    final unlockedBalance = await getUnlockedBalance();
-    final needToChange = _onBalanceChange.value != null
-        ? _onBalanceChange.value.fullBalance != fullBalance ||
-            _onBalanceChange.value.unlockedBalance != unlockedBalance
-        : true;
-
-    if (!needToChange) {
-      return;
-    }
-
-    _onBalanceChange.add(MoneroBalance(
-        fullBalance: fullBalance, unlockedBalance: unlockedBalance));
-  }
-
-  Future askForUpdateTransactionHistory() async => await getHistory().update();
-
-  void changeCurrentSubaddress(Subaddress subaddress) =>
-      _subaddress.value = subaddress;
-
-  void changeAccount(Account account) {
-    _account.add(account);
-    final subaddress = getSubaddress()..refresh(accountIndex: account.id);
-    _subaddress.value = subaddress.getAll().first;
-  }
-
-  Future store() async {
-    if (_isSaving) {
-      return;
-    }
-
-    try {
-      _isSaving = true;
-      await monero_wallet.store();
-      _isSaving = false;
-    } on PlatformException catch (e) {
-      print(e);
-      _isSaving = false;
-      rethrow;
-    }
-  }
-
-  void setListeners() => null;
-//  monero_wallet.setListeners(
-//      _onNewBlock, _onNeedToRefresh, _onNewTransaction);
-
-//  Future _onNewBlock(int height) async {
-//    try {
-//      final nodeHeight = await getNodeHeightOrUpdate(height);
-//
-//      if (isRecovery && _refreshHeight <= 0) {
-//        _refreshHeight = height;
-//      }
-//
-//      if (isRecovery &&
-//          (_lastSyncHeight == 0 ||
-//              (height - _lastSyncHeight) > moneroBlockSize)) {
-//        _lastSyncHeight = height;
-//        await askForUpdateBalance();
-//        await askForUpdateTransactionHistory();
-//      }
-//
-//      if (height > 0 && ((nodeHeight - height) < moneroBlockSize)) {
-//        _syncStatus.add(SyncedSyncStatus());
-//      } else {
-//        _syncStatus.add(SyncingSyncStatus(height, nodeHeight, _refreshHeight));
-//      }
-//    } catch (e) {
-//      print(e);
-//    }
-//  }
-
-//  Future _onNeedToRefresh() async {
-//    try {
-//
-//
-//      if (_syncStatus.value is FailedSyncStatus) {
-//        return;
-//      }
-//
-//      await askForUpdateBalance();
-//
-//      _syncStatus.add(SyncedSyncStatus());
-//
-//      if (isRecovery) {
-//        await askForUpdateTransactionHistory();
-//      }
-//
-////      if (isRecovery && (nodeHeight - currentHeight < moneroBlockSize)) {
-////        await setAsRecovered();
-////      }
-//
-//      final now = DateTime.now().millisecondsSinceEpoch;
-//      final diff = now - _lastRefreshTime;
-//
-//      if (diff >= 0 && diff < 60000) {
-//        return;
-//      }
-//
-//      await store();
-//      _lastRefreshTime = now;
-//    } catch (e) {
-//      print(e);
-//    }
-//  }
-
-//  Future _onNewTransaction() async {
-//    await askForUpdateBalance();
-//    await askForUpdateTransactionHistory();
-//  }
-}
diff --git a/lib/src/domain/monero/monero_wallets_manager.dart b/lib/src/domain/monero/monero_wallets_manager.dart
deleted file mode 100644
index 71f8406c2..000000000
--- a/lib/src/domain/monero/monero_wallets_manager.dart
+++ /dev/null
@@ -1,163 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'package:cake_wallet/src/domain/common/pathForWallet.dart';
-import 'package:flutter/foundation.dart';
-import 'package:hive/hive.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:cw_monero/wallet_manager.dart' as monero_wallet_manager;
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/common/wallets_manager.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/common/wallet_description.dart';
-
-class MoneroWalletsManager extends WalletsManager {
-  MoneroWalletsManager({@required this.walletInfoSource});
-
-  static const type = WalletType.monero;
-
-  Box<WalletInfo> walletInfoSource;
-
-  @override
-  Future<Wallet> create(String name, String password, String language) async {
-    try {
-      const isRecovery = false;
-      final path = await pathForWallet(name: name, type: WalletType.monero);
-
-      await monero_wallet_manager.createWallet(
-          path: path, password: password, language: language);
-
-      final wallet = await MoneroWallet.createdWallet(
-          walletInfoSource: walletInfoSource,
-          name: name,
-          isRecovery: isRecovery);
-      await wallet.updateInfo();
-
-      return wallet;
-    } catch (e) {
-      print('MoneroWalletsManager Error: $e');
-      rethrow;
-    }
-  }
-
-  @override
-  Future<Wallet> restoreFromSeed(
-      String name, String password, String seed, int restoreHeight) async {
-    try {
-      const isRecovery = true;
-      final path = await pathForWallet(name: name, type: WalletType.monero);
-
-      await monero_wallet_manager.restoreFromSeed(
-          path: path,
-          password: password,
-          seed: seed,
-          restoreHeight: restoreHeight);
-
-      final wallet = await MoneroWallet.createdWallet(
-          walletInfoSource: walletInfoSource,
-          name: name,
-          isRecovery: isRecovery,
-          restoreHeight: restoreHeight);
-      await wallet.updateInfo();
-
-      return wallet;
-    } catch (e) {
-      print('MoneroWalletsManager Error: $e');
-      rethrow;
-    }
-  }
-
-  @override
-  Future<Wallet> restoreFromKeys(
-      String name,
-      String password,
-      String language,
-      int restoreHeight,
-      String address,
-      String viewKey,
-      String spendKey) async {
-    try {
-      const isRecovery = true;
-      final path = await pathForWallet(name: name, type: WalletType.monero);
-
-      await monero_wallet_manager.restoreFromKeys(
-          path: path,
-          password: password,
-          language: language,
-          restoreHeight: restoreHeight,
-          address: address,
-          viewKey: viewKey,
-          spendKey: spendKey);
-
-      final wallet = await MoneroWallet.createdWallet(
-          walletInfoSource: walletInfoSource,
-          name: name,
-          isRecovery: isRecovery,
-          restoreHeight: restoreHeight);
-      await wallet.updateInfo();
-
-      return wallet;
-    } catch (e) {
-      print('MoneroWalletsManager Error: $e');
-      rethrow;
-    }
-  }
-
-  @override
-  Future<Wallet> openWallet(String name, String password) async {
-    try {
-      final path = await pathForWallet(name: name, type: WalletType.monero);
-      monero_wallet_manager.openWallet(path: path, password: password);
-      final wallet = await MoneroWallet.load(walletInfoSource, name, type);
-      await wallet.updateInfo();
-
-      return wallet;
-    } catch (e) {
-      print('MoneroWalletsManager Error: $e');
-      rethrow;
-    }
-  }
-
-  @override
-  Future<bool> isWalletExit(String name) async {
-    try {
-      final path = await pathForWallet(name: name, type: WalletType.monero);
-      return monero_wallet_manager.isWalletExist(path: path);
-    } catch (e) {
-      print('MoneroWalletsManager Error: $e');
-      rethrow;
-    }
-  }
-
-  @override
-  Future remove(WalletDescription wallet) async {
-    final dir = await getApplicationDocumentsDirectory();
-    final root = dir.path.replaceAll('app_flutter', 'files');
-    final walletFilePath = root + '/cw_monero/' + wallet.name;
-    final keyPath = walletFilePath + '.keys';
-    final addressFilePath = walletFilePath + '.address.txt';
-    final walletFile = File(walletFilePath);
-    final keyFile = File(keyPath);
-    final addressFile = File(addressFilePath);
-
-    if (await walletFile.exists()) {
-      await walletFile.delete();
-    }
-
-    if (await keyFile.exists()) {
-      await keyFile.delete();
-    }
-
-    if (await addressFile.exists()) {
-      await addressFile.delete();
-    }
-
-    final id =
-        walletTypeToString(wallet.type).toLowerCase() + '_' + wallet.name;
-    final info = walletInfoSource.values
-        .firstWhere((info) => info.id == id, orElse: () => null);
-
-    await info?.delete();
-  }
-}
diff --git a/lib/src/domain/monero/subaddress_list.dart b/lib/src/domain/monero/subaddress_list.dart
deleted file mode 100644
index 5e5efe8ed..000000000
--- a/lib/src/domain/monero/subaddress_list.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:cw_monero/subaddress_list.dart' as subaddress_list;
-import 'package:cake_wallet/src/domain/monero/subaddress.dart';
-
-class SubaddressList {
-  SubaddressList() {
-    _isRefreshing = false;
-    _isUpdating = false;
-    _subaddress = BehaviorSubject<List<Subaddress>>();
-  }
-
-  Observable<List<Subaddress>> get subaddresses => _subaddress.stream;
-
-  BehaviorSubject<List<Subaddress>> _subaddress;
-  bool _isRefreshing;
-  bool _isUpdating;
-
-  void update({int accountIndex}) {
-    if (_isUpdating) {
-      return;
-    }
-
-    try {
-      _isUpdating = true;
-      refresh(accountIndex: accountIndex);
-      _subaddress.add(getAll());
-      _isUpdating = false;
-    } catch (e) {
-      _isUpdating = false;
-      rethrow;
-    }
-  }
-
-  List<Subaddress> getAll() {
-    return subaddress_list
-        .getAllSubaddresses()
-        .map((subaddressRow) => Subaddress.fromRow(subaddressRow))
-        .toList();
-  }
-
-  Future addSubaddress({int accountIndex, String label}) async {
-    await subaddress_list.addSubaddress(
-        accountIndex: accountIndex, label: label);
-    await update(accountIndex: accountIndex);
-  }
-
-  Future setLabelSubaddress(
-      {int accountIndex, int addressIndex, String label}) async {
-    await subaddress_list.setLabelForSubaddress(
-        accountIndex: accountIndex, addressIndex: addressIndex, label: label);
-    await update(accountIndex: accountIndex);
-  }
-
-  void refresh({int accountIndex}) {
-    if (_isRefreshing) {
-      return;
-    }
-
-    try {
-      _isRefreshing = true;
-      subaddress_list.refreshSubaddresses(accountIndex: accountIndex);
-      _isRefreshing = false;
-    } on PlatformException catch (e) {
-      _isRefreshing = false;
-      print(e);
-      rethrow;
-    }
-  }
-}
diff --git a/lib/src/domain/services/fiat_convertation_service.dart b/lib/src/domain/services/fiat_convertation_service.dart
deleted file mode 100644
index ad81b35e5..000000000
--- a/lib/src/domain/services/fiat_convertation_service.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-import 'dart:async';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/fetch_price.dart';
-
-class FiatConvertationService {
-  Future<double> getPrice({CryptoCurrency crypto, FiatCurrency fiat}) async {
-    return await fetchPriceFor(crypto: crypto, fiat: fiat);
-  }
-}
\ No newline at end of file
diff --git a/lib/src/domain/services/user_service.dart b/lib/src/domain/services/user_service.dart
deleted file mode 100644
index 95429e528..000000000
--- a/lib/src/domain/services/user_service.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/common/secret_store_key.dart';
-import 'package:cake_wallet/src/domain/common/encrypt.dart';
-
-class UserService {
-  UserService({this.sharedPreferences, this.secureStorage});
-
-  final FlutterSecureStorage secureStorage;
-  final SharedPreferences sharedPreferences;
-
-  Future setPassword(String password) async {
-    final key = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
-
-    try {
-      final encodedPassord = encodedPinCode(pin: password);
-
-      await secureStorage.write(key: key, value: encodedPassord);
-    } catch (e) {
-      print(e);
-    }
-  }
-
-  Future<bool> canAuthenticate() async {
-    final key = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
-    final sharedPreferences = await SharedPreferences.getInstance();
-    final walletName = sharedPreferences.getString("current_wallet_name") ?? "";
-    var password = '';
-
-    try {
-      password = await secureStorage.read(key: key);
-    } catch (e) {
-      print(e);
-    }
-
-    return walletName.isNotEmpty && password.isNotEmpty;
-  }
-
-  Future<bool> authenticate(String pin) async {
-    final key = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
-    final encodedPin = await secureStorage.read(key: key);
-    final decodedPin = decodedPinCode(pin: encodedPin);
-
-    return decodedPin == pin;
-  }
-}
diff --git a/lib/src/domain/services/wallet_list_service.dart b/lib/src/domain/services/wallet_list_service.dart
deleted file mode 100644
index 28cb2b0ab..000000000
--- a/lib/src/domain/services/wallet_list_service.dart
+++ /dev/null
@@ -1,163 +0,0 @@
-import 'dart:async';
-import 'package:cake_wallet/bitcoin/key.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
-import 'package:flutter/foundation.dart';
-import 'package:hive/hive.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:uuid/uuid.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/common/encrypt.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/common/wallet_description.dart';
-import 'package:cake_wallet/src/domain/common/wallets_manager.dart';
-import 'package:cake_wallet/src/domain/common/secret_store_key.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/monero/monero_wallets_manager.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-
-class WalletIsExistException implements Exception {
-  WalletIsExistException(this.name);
-
-  String name;
-
-  @override
-  String toString() => "Wallet with name $name is already exist!";
-}
-
-class WalletListService {
-  WalletListService(
-      {this.secureStorage,
-      this.walletInfoSource,
-      this.walletsManager,
-      @required this.walletService,
-      @required this.sharedPreferences})
-      : _type = WalletType.monero;
-
-  final FlutterSecureStorage secureStorage;
-  final WalletService walletService;
-  final Box<WalletInfo> walletInfoSource;
-  final SharedPreferences sharedPreferences;
-  WalletsManager walletsManager;
-  WalletType _type;
-
-  Future<List<WalletDescription>> getAll() async => walletInfoSource.values
-      .map((info) => WalletDescription(name: info.name, type: info.type))
-      .toList();
-
-  Future create(String name, String language) async {
-    if (await walletsManager.isWalletExit(name)) {
-      throw WalletIsExistException(name);
-    }
-
-    if (walletService.currentWallet != null) {
-      await walletService.close();
-    }
-
-    final password = _generatePassword();
-    await saveWalletPassword(password: password, walletName: name);
-
-    final wallet = await walletsManager.create(name, password, language);
-
-    await onWalletChange(wallet);
-  }
-
-  Future restoreFromSeed(String name, String seed, int restoreHeight) async {
-    if (await walletsManager.isWalletExit(name)) {
-      throw WalletIsExistException(name);
-    }
-
-    if (walletService.currentWallet != null) {
-      await walletService.close();
-    }
-
-    final password = _generatePassword();
-    await saveWalletPassword(password: password, walletName: name);
-
-    final wallet = await walletsManager.restoreFromSeed(
-        name, password, seed, restoreHeight);
-
-    await onWalletChange(wallet);
-  }
-
-  Future restoreFromKeys(String name, String language, int restoreHeight,
-      String address, String viewKey, String spendKey) async {
-    if (await walletsManager.isWalletExit(name)) {
-      throw WalletIsExistException(name);
-    }
-
-    if (walletService.currentWallet != null) {
-      await walletService.close();
-    }
-
-    final password = _generatePassword();
-    await saveWalletPassword(password: password, walletName: name);
-
-    final wallet = await walletsManager.restoreFromKeys(
-        name, password, language, restoreHeight, address, viewKey, spendKey);
-
-    await onWalletChange(wallet);
-  }
-
-  Future openWallet(String name) async {
-    if (walletService.currentWallet != null) {
-      await walletService.close();
-    }
-
-    final password = await getWalletPassword(walletName: name);
-    final wallet = await walletsManager.openWallet(name, password);
-
-    await onWalletChange(wallet);
-  }
-
-  Future changeWalletManger({WalletType walletType}) async {
-    _type = walletType;
-
-    switch (walletType) {
-      case WalletType.monero:
-        walletsManager =
-            MoneroWalletsManager(walletInfoSource: walletInfoSource);
-        break;
-      case WalletType.bitcoin:
-//        walletsManager = BitcoinWalletManager();
-        break;
-      case WalletType.none:
-        walletsManager = null;
-        break;
-    }
-  }
-
-  Future onWalletChange(Wallet wallet) async {
-    walletService.currentWallet = wallet;
-    final walletName = await wallet.getName();
-    print('walletName $walletName ');
-    await sharedPreferences.setString('current_wallet_name', walletName);
-  }
-
-  Future remove(WalletDescription wallet) async =>
-      await walletsManager.remove(wallet);
-
-  Future<String> getWalletPassword({String walletName}) async {
-    final key = generateStoreKeyFor(
-        key: SecretStoreKey.moneroWalletPassword, walletName: walletName);
-    final encodedPassword = await secureStorage.read(key: key);
-
-    return decodeWalletPassword(password: encodedPassword);
-  }
-
-  Future saveWalletPassword({String walletName, String password}) async {
-    final key = generateStoreKeyFor(
-        key: SecretStoreKey.moneroWalletPassword, walletName: walletName);
-    final encodedPassword = encodeWalletPassword(password: password);
-
-    await secureStorage.write(key: key, value: encodedPassword);
-  }
-
-  String _generatePassword() {
-    switch (_type) {
-      case WalletType.bitcoin:
-        return generateKey();
-      default:
-        return Uuid().v4();
-    }
-  }
-}
diff --git a/lib/src/domain/services/wallet_service.dart b/lib/src/domain/services/wallet_service.dart
deleted file mode 100644
index b5aef353a..000000000
--- a/lib/src/domain/services/wallet_service.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-import 'package:rxdart/rxdart.dart';
-import 'package:cake_wallet/src/domain/common/balance.dart';
-import 'package:cake_wallet/src/domain/common/wallet_description.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/common/transaction_history.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/transaction_creation_credentials.dart';
-import 'package:cake_wallet/src/domain/common/pending_transaction.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-
-class WalletService extends Wallet {
-  WalletService() {
-    _currentWallet = null;
-    walletType = WalletType.none;
-    _syncStatus = BehaviorSubject<SyncStatus>();
-    _onBalanceChange = BehaviorSubject<Balance>();
-    _onWalletChanged = BehaviorSubject<Wallet>();
-  }
-
-  @override
-  Observable<Balance> get onBalanceChange => _onBalanceChange.stream;
-
-  @override
-  Observable<SyncStatus> get syncStatus => _syncStatus.stream;
-
-  @override
-  Observable<String> get onAddressChange => _currentWallet.onAddressChange;
-
-  @override
-  Observable<String> get onNameChange => _currentWallet.onNameChange;
-
-  @override
-  String get address => _currentWallet.address;
-
-  @override
-  String get name => _currentWallet.name;
-
-  @override
-  WalletType get walletType => _currentWallet.walletType;
-
-  Observable<Wallet> get onWalletChange => _onWalletChanged.stream;
-
-  SyncStatus get syncStatusValue => _syncStatus.value;
-
-  Wallet get currentWallet => _currentWallet;
-
-  set currentWallet(Wallet wallet) {
-    _currentWallet = wallet;
-
-    if (wallet == null) {
-      return;
-    }
-
-    _currentWallet.onBalanceChange
-        .listen((wallet) => _onBalanceChange.add(wallet));
-    _currentWallet.syncStatus.listen((status) => _syncStatus.add(status));
-    _onWalletChanged.add(wallet);
-
-    final type = wallet.getType();
-    wallet.getName().then(
-        (name) => description = WalletDescription(name: name, type: type));
-  }
-
-  BehaviorSubject<Wallet> _onWalletChanged;
-  BehaviorSubject<Balance> _onBalanceChange;
-  BehaviorSubject<SyncStatus> _syncStatus;
-  Wallet _currentWallet;
-
-  WalletDescription description;
-
-  @override
-  WalletType getType() => _currentWallet.getType();
-
-  @override
-  Future<String> getFilename() => _currentWallet.getFilename();
-
-  @override
-  Future<String> getName() => _currentWallet.getName();
-
-  @override
-  Future<String> getAddress() => _currentWallet.getAddress();
-
-  @override
-  Future<String> getSeed() => _currentWallet.getSeed();
-
-  @override
-  Future<Map<String, String>> getKeys() => _currentWallet.getKeys();
-
-  @override
-  Future<String> getFullBalance() => _currentWallet.getFullBalance();
-
-  @override
-  Future<String> getUnlockedBalance() => _currentWallet.getUnlockedBalance();
-
-  @override
-  Future<int> getCurrentHeight() => _currentWallet.getCurrentHeight();
-
-  @override
-  Future<int> getNodeHeight() => _currentWallet.getNodeHeight();
-
-  @override
-  Future<bool> isConnected() => _currentWallet.isConnected();
-
-  @override
-  Future close() => _currentWallet.close();
-
-  @override
-  Future connectToNode(
-          {Node node, bool useSSL = false, bool isLightWallet = false}) =>
-      _currentWallet.connectToNode(
-          node: node, useSSL: useSSL, isLightWallet: isLightWallet);
-
-  @override
-  Future startSync() => _currentWallet.startSync();
-
-  @override
-  TransactionHistory getHistory() => _currentWallet.getHistory();
-
-  @override
-  Future<PendingTransaction> createTransaction(
-          TransactionCreationCredentials credentials) =>
-      _currentWallet.createTransaction(credentials);
-
-  @override
-  Future updateInfo() async => _currentWallet.updateInfo();
-
-  @override
-  Future rescan({int restoreHeight = 0}) async =>
-      _currentWallet.rescan(restoreHeight: restoreHeight);
-}
diff --git a/lib/src/reactions/set_reactions.dart b/lib/src/reactions/set_reactions.dart
index 1584dc89f..788f3bcb1 100644
--- a/lib/src/reactions/set_reactions.dart
+++ b/lib/src/reactions/set_reactions.dart
@@ -1,98 +1,98 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/start_updating_price.dart';
-import 'package:cake_wallet/src/stores/sync/sync_store.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/src/stores/price/price_store.dart';
-import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
-import 'package:cake_wallet/src/stores/login/login_store.dart';
-
-Timer _reconnectionTimer;
-ReactionDisposer _connectToNodeDisposer;
-ReactionDisposer _onSyncStatusChangeDisposer;
-ReactionDisposer _onCurrentWalletChangeDisposer;
-
-void setReactions(
-    {@required SettingsStore settingsStore,
-    @required PriceStore priceStore,
-    @required SyncStore syncStore,
-    @required WalletStore walletStore,
-    @required WalletService walletService,
-//    @required AuthenticationStore authenticationStore,
-    @required LoginStore loginStore}) {
-  connectToNode(settingsStore: settingsStore, walletStore: walletStore);
-  onSyncStatusChange(
-      syncStore: syncStore,
-      walletStore: walletStore,
-      settingsStore: settingsStore);
-  onCurrentWalletChange(
-      walletStore: walletStore,
-      settingsStore: settingsStore,
-      priceStore: priceStore);
-  autorun((_) async {
-//    if (authenticationStore.state == AuthenticationState.allowed) {
-//      await loginStore.loadCurrentWallet();
-//      authenticationStore.state = AuthenticationState.readyToLogin;
-//    }
-  });
-}
-
-void connectToNode({SettingsStore settingsStore, WalletStore walletStore}) {
-  _connectToNodeDisposer?.call();
-
-  _connectToNodeDisposer = reaction((_) => settingsStore.node,
-      (Node node) async => await walletStore.connectToNode(node: node));
-}
-
-void onCurrentWalletChange(
-    {WalletStore walletStore,
-    SettingsStore settingsStore,
-    PriceStore priceStore}) {
-  _onCurrentWalletChangeDisposer?.call();
-
-  reaction((_) => walletStore.name, (String _) {
-    walletStore.connectToNode(node: settingsStore.node);
-    startUpdatingPrice(settingsStore: settingsStore, priceStore: priceStore);
-  });
-}
-
-void onSyncStatusChange(
-    {SyncStore syncStore,
-    WalletStore walletStore,
-    SettingsStore settingsStore}) {
-  // _onSyncStatusChangeDisposer?.call();
-
-  // reaction((_) => syncStore.status, (SyncStatus status) async {
-  //   if (status is ConnectedSyncStatus) {
-  //     await walletStore.startSync();
-  //   }
-
-  //   // Reconnect to the node if the app is not started sync after 30 seconds
-  //   if (status is StartingSyncStatus) {
-  //     startReconnectionObserver(syncStore: syncStore, walletStore: walletStore);
-  //   }
-  // });
-}
-
-void startReconnectionObserver({SyncStore syncStore, WalletStore walletStore}) {
-  if (_reconnectionTimer != null) {
-    _reconnectionTimer.cancel();
-  }
-
-  _reconnectionTimer = Timer.periodic(Duration(minutes: 1), (_) async {
-    try {
-      final isConnected = await walletStore.isConnected();
-
-      if (!isConnected) {
-        await walletStore.reconnect();
-      }
-    } catch (e) {
-      print(e);
-    }
-  });
-}
+// import 'dart:async';
+// import 'package:flutter/foundation.dart';
+// import 'package:mobx/mobx.dart';
+// import 'package:cake_wallet/entities/node.dart';
+// import 'package:cake_wallet/entities/sync_status.dart';
+// import 'package:cake_wallet/src/domain/services/wallet_service.dart';
+// import 'package:cake_wallet/src/start_updating_price.dart';
+// import 'package:cake_wallet/src/stores/sync/sync_store.dart';
+// import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
+// import 'package:cake_wallet/src/stores/settings/settings_store.dart';
+// import 'package:cake_wallet/src/stores/price/price_store.dart';
+// import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
+// import 'package:cake_wallet/src/stores/login/login_store.dart';
+//
+// Timer _reconnectionTimer;
+// ReactionDisposer _connectToNodeDisposer;
+// ReactionDisposer _onSyncStatusChangeDisposer;
+// ReactionDisposer _onCurrentWalletChangeDisposer;
+//
+// void setReactions(
+//     {@required SettingsStore settingsStore,
+//     @required PriceStore priceStore,
+//     @required SyncStore syncStore,
+//     @required WalletStore walletStore,
+//     @required WalletService walletService,
+// //    @required AuthenticationStore authenticationStore,
+//     @required LoginStore loginStore}) {
+//   connectToNode(settingsStore: settingsStore, walletStore: walletStore);
+//   onSyncStatusChange(
+//       syncStore: syncStore,
+//       walletStore: walletStore,
+//       settingsStore: settingsStore);
+//   onCurrentWalletChange(
+//       walletStore: walletStore,
+//       settingsStore: settingsStore,
+//       priceStore: priceStore);
+//   autorun((_) async {
+// //    if (authenticationStore.state == AuthenticationState.allowed) {
+// //      await loginStore.loadCurrentWallet();
+// //      authenticationStore.state = AuthenticationState.readyToLogin;
+// //    }
+//   });
+// }
+//
+// void connectToNode({SettingsStore settingsStore, WalletStore walletStore}) {
+//   _connectToNodeDisposer?.call();
+//
+//   _connectToNodeDisposer = reaction((_) => settingsStore.node,
+//       (Node node) async => await walletStore.connectToNode(node: node));
+// }
+//
+// void onCurrentWalletChange(
+//     {WalletStore walletStore,
+//     SettingsStore settingsStore,
+//     PriceStore priceStore}) {
+//   _onCurrentWalletChangeDisposer?.call();
+//
+//   reaction((_) => walletStore.name, (String _) {
+//     walletStore.connectToNode(node: settingsStore.node);
+//     startUpdatingPrice(settingsStore: settingsStore, priceStore: priceStore);
+//   });
+// }
+//
+// void onSyncStatusChange(
+//     {SyncStore syncStore,
+//     WalletStore walletStore,
+//     SettingsStore settingsStore}) {
+//   // _onSyncStatusChangeDisposer?.call();
+//
+//   // reaction((_) => syncStore.status, (SyncStatus status) async {
+//   //   if (status is ConnectedSyncStatus) {
+//   //     await walletStore.startSync();
+//   //   }
+//
+//   //   // Reconnect to the node if the app is not started sync after 30 seconds
+//   //   if (status is StartingSyncStatus) {
+//   //     startReconnectionObserver(syncStore: syncStore, walletStore: walletStore);
+//   //   }
+//   // });
+// }
+//
+// void startReconnectionObserver({SyncStore syncStore, WalletStore walletStore}) {
+//   if (_reconnectionTimer != null) {
+//     _reconnectionTimer.cancel();
+//   }
+//
+//   _reconnectionTimer = Timer.periodic(Duration(minutes: 1), (_) async {
+//     try {
+//       final isConnected = await walletStore.isConnected();
+//
+//       if (!isConnected) {
+//         await walletStore.reconnect();
+//       }
+//     } catch (e) {
+//       print(e);
+//     }
+//   });
+// }
diff --git a/lib/src/screens/auth/auth_page.dart b/lib/src/screens/auth/auth_page.dart
index d9c362ab4..13c74f6e1 100644
--- a/lib/src/screens/auth/auth_page.dart
+++ b/lib/src/screens/auth/auth_page.dart
@@ -5,20 +5,18 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/view_model/auth_state.dart';
 import 'package:cake_wallet/view_model/auth_view_model.dart';
 import 'package:cake_wallet/src/screens/pin_code/pin_code.dart';
-import 'package:cake_wallet/src/domain/common/biometric_auth.dart';
+import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
+import 'package:cake_wallet/entities/biometric_auth.dart';
+import 'package:cake_wallet/core/execution_state.dart';
 
 typedef OnAuthenticationFinished = void Function(bool, AuthPageState);
 
 class AuthPage extends StatefulWidget {
-  AuthPage(
-      {@required this.allowBiometricalAuthentication,
-      this.onAuthenticationFinished,
-      this.authViewModel,
-      this.closable = true});
+  AuthPage(this.authViewModel,
+      {this.onAuthenticationFinished, this.closable = true});
 
   final AuthViewModel authViewModel;
   final OnAuthenticationFinished onAuthenticationFinished;
-  final bool allowBiometricalAuthentication;
   final bool closable;
 
   @override
@@ -35,8 +33,8 @@ class AuthPageState extends State<AuthPage> {
   @override
   void initState() {
     _reaction ??=
-        reaction((_) => widget.authViewModel.state, (AuthState state) {
-      if (state is AuthenticatedSuccessfully) {
+        reaction((_) => widget.authViewModel.state, (ExecutionState state) {
+      if (state is ExecutedSuccessfullyState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           if (widget.onAuthenticationFinished != null) {
             widget.onAuthenticationFinished(true, this);
@@ -51,7 +49,7 @@ class AuthPageState extends State<AuthPage> {
         });
       }
 
-      if (state is AuthenticationInProgress) {
+      if (state is IsExecutingState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           _key.currentState.showSnackBar(
             SnackBar(
@@ -62,7 +60,7 @@ class AuthPageState extends State<AuthPage> {
         });
       }
 
-      if (state is AuthenticationFailure) {
+      if (state is FailureState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           _pinCodeKey.currentState.clear();
           _key.currentState.hideCurrentSnackBar();
@@ -97,23 +95,10 @@ class AuthPageState extends State<AuthPage> {
       }
     });
 
-    if (widget.allowBiometricalAuthentication) {
+    if (widget.authViewModel.isBiometricalAuthenticationAllowed) {
       WidgetsBinding.instance.addPostFrameCallback((_) async {
-        print('post');
         await Future<void>.delayed(Duration(milliseconds: 100));
-        print('after timeout');
-        final biometricAuth = BiometricAuth();
-        final isAuth = await biometricAuth.isAuthenticated();
-
-        if (isAuth) {
-          widget.authViewModel.biometricAuth();
-          _key.currentState.showSnackBar(
-            SnackBar(
-              content: Text(S.of(context).authenticated),
-              backgroundColor: Colors.green,
-            ),
-          );
-        }
+        await widget.authViewModel.biometricAuth();
       });
     }
 
@@ -133,34 +118,28 @@ class AuthPageState extends State<AuthPage> {
 
   @override
   Widget build(BuildContext context) {
-    print('start');
-
     return Scaffold(
         key: _key,
         appBar: CupertinoNavigationBar(
-          leading: widget.closable
-              ? SizedBox(
-                  height: 37,
-                  width: 20,
-                  child: ButtonTheme(
-                    minWidth: double.minPositive,
-                    child: FlatButton(
-                        highlightColor: Colors.transparent,
-                        splashColor: Colors.transparent,
-                        padding: EdgeInsets.all(0),
-                        onPressed: () => Navigator.of(context).pop(),
-                        child: _backArrowImageDarkTheme),
-                  ),
-                )
-              : Container(),
-          backgroundColor: Theme.of(context).backgroundColor,
-          border: null,
-        ),
+            leading: widget.closable
+                ? SizedBox(
+                    height: 37,
+                    width: 20,
+                    child: ButtonTheme(
+                      minWidth: double.minPositive,
+                      child: FlatButton(
+                          highlightColor: Colors.transparent,
+                          splashColor: Colors.transparent,
+                          padding: EdgeInsets.all(0),
+                          onPressed: () => Navigator.of(context).pop(),
+                          child: _backArrowImageDarkTheme),
+                    ),
+                  )
+                : Container(),
+            backgroundColor: Theme.of(context).backgroundColor,
+            border: null),
         resizeToAvoidBottomPadding: false,
-        body: PinCode(
-            (pin, _) => widget.authViewModel
-                .auth(password: pin.fold('', (ac, val) => ac + '$val')),
-            false,
-            _pinCodeKey));
+        body: PinCode((pin, _) => widget.authViewModel.auth(password: pin),
+            (_) => null, widget.authViewModel.pinLength, false, _pinCodeKey));
   }
 }
diff --git a/lib/src/screens/auth/create_login_page.dart b/lib/src/screens/auth/create_login_page.dart
deleted file mode 100644
index 1c817d65e..000000000
--- a/lib/src/screens/auth/create_login_page.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/services/user_service.dart';
-import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/screens/auth/auth_page.dart';
-import 'package:cake_wallet/src/stores/auth/auth_store.dart';
-import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
-
-Widget createLoginPage(
-        {@required SharedPreferences sharedPreferences,
-        @required UserService userService,
-        @required WalletService walletService,
-        @required WalletListService walletListService,
-        @required AuthenticationStore authenticationStore}) =>
-    null;
-//    Provider(
-//        create: (_) => AuthStore(
-//            sharedPreferences: sharedPreferences,
-//            userService: userService,
-//            walletService: walletService),
-//        child: AuthPage(
-//            onAuthenticationFinished: (isAuthenticated, state) {
-//              if (isAuthenticated) {
-//                authenticationStore.loggedIn();
-//              }
-//            },
-//            closable: false));
diff --git a/lib/src/screens/auth/create_unlock_page.dart b/lib/src/screens/auth/create_unlock_page.dart
deleted file mode 100644
index 7a9628218..000000000
--- a/lib/src/screens/auth/create_unlock_page.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/services/user_service.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/screens/auth/auth_page.dart';
-import 'package:cake_wallet/src/stores/auth/auth_store.dart';
-
-Widget createUnlockPage(
-          {@required SharedPreferences sharedPreferences,
-          @required UserService userService,
-          @required WalletService walletService,
-          @required Function(bool, AuthPageState) onAuthenticationFinished}) =>
-     null;
-//      WillPopScope(
-//          onWillPop: () async => false,
-//          child: Provider(
-//              create: (_) => AuthStore(
-//                  sharedPreferences: sharedPreferences,
-//                  userService: userService,
-//                  walletService: walletService),
-//              child: AuthPage(
-//                  onAuthenticationFinished: onAuthenticationFinished,
-//                  closable: false)));
\ No newline at end of file
diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart
index ca4bfe825..8d4080c14 100644
--- a/lib/src/screens/base_page.dart
+++ b/lib/src/screens/base_page.dart
@@ -94,8 +94,8 @@ abstract class BasePage extends StatelessWidget {
             leading: leading(context),
             middle: middle(context),
             trailing: trailing(context),
-            backgroundColor:
-                _isDarkTheme ? backgroundDarkColor : backgroundLightColor);
+            backgroundColor: Colors.transparent);
+                // _isDarkTheme ? backgroundDarkColor : backgroundLightColor);
 
       case AppBarStyle.withShadow:
         return NavBar.withShadow(
@@ -131,7 +131,7 @@ abstract class BasePage extends StatelessWidget {
         resizeToAvoidBottomPadding: resizeToAvoidBottomPadding,
         endDrawer: endDrawer,
         appBar: appBar(context),
-        body: body(context), //SafeArea(child: ),
+        body: body(context),
         floatingActionButton: floatingActionButton(context));
 
     return rootWrapper?.call(context, root) ?? root;
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 874cb71e0..dc1d14b72 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -5,7 +5,7 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
diff --git a/lib/src/screens/contact/contact_page.dart b/lib/src/screens/contact/contact_page.dart
index 3670af7d9..e73760ce1 100644
--- a/lib/src/screens/contact/contact_page.dart
+++ b/lib/src/screens/contact/contact_page.dart
@@ -6,9 +6,9 @@ import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/address_validator.dart';
 import 'package:cake_wallet/core/contact_name_validator.dart';
+import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_view_model.dart';
-import 'package:cake_wallet/view_model/contact_list/contact_view_model_state.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
@@ -48,12 +48,12 @@ class ContactPage extends BasePage {
     final downArrow = Image.asset('assets/images/arrow_bottom_purple_icon.png',
         color: Theme.of(context).primaryTextTheme.overline.color, height: 8);
 
-    reaction((_) => contactViewModel.state, (ContactViewModelState state) {
-      if (state is ContactCreationFailure) {
+    reaction((_) => contactViewModel.state, (ExecutionState state) {
+      if (state is FailureState) {
         _onContactSavingFailure(context, state.error);
       }
 
-      if (state is ContactSavingSuccessfully) {
+      if (state is ExecutedSuccessfullyState) {
         _onContactSavedSuccessfully(context);
       }
     });
diff --git a/lib/src/screens/dashboard/create_dashboard_page.dart b/lib/src/screens/dashboard/create_dashboard_page.dart
index b2163c339..a14c2498a 100644
--- a/lib/src/screens/dashboard/create_dashboard_page.dart
+++ b/lib/src/screens/dashboard/create_dashboard_page.dart
@@ -1,31 +1,33 @@
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:provider/provider.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/monero/transaction_description.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/screens/dashboard/dashboard_page.dart';
-import 'package:cake_wallet/src/stores/action_list/action_list_store.dart';
-import 'package:cake_wallet/src/stores/action_list/trade_filter_store.dart';
-import 'package:cake_wallet/src/stores/action_list/transaction_filter_store.dart';
-import 'package:cake_wallet/src/stores/price/price_store.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+// import 'package:cake_wallet/monero/transaction_description.dart';
+// import 'package:cake_wallet/src/domain/services/wallet_service.dart';
+// import 'package:cake_wallet/src/screens/dashboard/dashboard_page.dart';
+// import 'package:cake_wallet/src/stores/action_list/action_list_store.dart';
+// import 'package:cake_wallet/src/stores/action_list/trade_filter_store.dart';
+// import 'package:cake_wallet/src/stores/action_list/transaction_filter_store.dart';
+// import 'package:cake_wallet/src/stores/price/price_store.dart';
+// import 'package:cake_wallet/src/stores/settings/settings_store.dart';
+// import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
 
-Widget createDashboardPage(
-        {@required WalletService walletService,
-        @required PriceStore priceStore,
-        @required Box<TransactionDescription> transactionDescriptions,
-        @required SettingsStore settingsStore,
-        @required Box<Trade> trades,
-        @required WalletStore walletStore}) =>
-    Provider(
-        create: (_) => ActionListStore(
-            walletService: walletService,
-            settingsStore: settingsStore,
-            priceStore: priceStore,
-            tradesSource: trades,
-            transactionFilterStore: TransactionFilterStore(),
-            tradeFilterStore: TradeFilterStore(walletStore: walletStore),
-            transactionDescriptions: transactionDescriptions),
-        child: DashboardPage());
+// FIXME: Remove me.
+
+// Widget createDashboardPage(
+//         {@required WalletService walletService,
+//         @required PriceStore priceStore,
+//         @required Box<TransactionDescription> transactionDescriptions,
+//         @required SettingsStore settingsStore,
+//         @required Box<Trade> trades,
+//         @required WalletStore walletStore}) =>
+//     Provider(
+//         create: (_) => ActionListStore(
+//             walletService: walletService,
+//             settingsStore: settingsStore,
+//             priceStore: priceStore,
+//             tradesSource: trades,
+//             transactionFilterStore: TransactionFilterStore(),
+//             tradeFilterStore: TradeFilterStore(walletStore: walletStore),
+//             transactionDescriptions: transactionDescriptions),
+//         child: DashboardPage());
diff --git a/lib/src/screens/dashboard/wallet_menu.dart b/lib/src/screens/dashboard/wallet_menu.dart
index 0b13ec9fa..1eb3864d0 100644
--- a/lib/src/screens/dashboard/wallet_menu.dart
+++ b/lib/src/screens/dashboard/wallet_menu.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:provider/provider.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 
diff --git a/lib/src/screens/dashboard/widgets/date_section_raw.dart b/lib/src/screens/dashboard/widgets/date_section_raw.dart
index a69268a21..4c0f9c389 100644
--- a/lib/src/screens/dashboard/widgets/date_section_raw.dart
+++ b/lib/src/screens/dashboard/widgets/date_section_raw.dart
@@ -1,26 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:provider/provider.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
+import 'package:cake_wallet/utils/date_formatter.dart';
 
 class DateSectionRaw extends StatelessWidget {
   DateSectionRaw({this.date});
 
-  static final nowDate = DateTime.now();
   final DateTime date;
 
   @override
   Widget build(BuildContext context) {
+    final nowDate = DateTime.now();
     final diffDays = date.difference(nowDate).inDays;
     final isToday = nowDate.day == date.day &&
         nowDate.month == date.month &&
         nowDate.year == date.year;
-    final settingsStore = Provider.of<SettingsStore>(context);
-    final currentLanguage = settingsStore.languageCode;
-    final dateSectionDateFormat = settingsStore.getCurrentDateFormat(
-          formatUSA: "yyyy MMM d",
-          formatDefault: "d MMM yyyy");
+    final dateSectionDateFormat = DateFormatter.withCurrentLocal();
     var title = "";
 
     if (isToday) {
@@ -28,21 +23,19 @@ class DateSectionRaw extends StatelessWidget {
     } else if (diffDays == 0) {
       title = S.of(context).yesterday;
     } else if (diffDays > -7 && diffDays < 0) {
-      final dateFormat = DateFormat.EEEE(currentLanguage);
+      final dateFormat = DateFormat.EEEE();
       title = dateFormat.format(date);
     } else {
       title = dateSectionDateFormat.format(date);
     }
 
     return Container(
-      height: 35,
-      alignment: Alignment.center,
-      color: Colors.transparent,
-      child: Text(title,
-        style: TextStyle(
-          fontSize: 12,
-          color: Theme.of(context).textTheme.overline.backgroundColor
-      ))
-    );
+        height: 35,
+        alignment: Alignment.center,
+        color: Colors.transparent,
+        child: Text(title,
+            style: TextStyle(
+                fontSize: 12,
+                color: Theme.of(context).textTheme.overline.backgroundColor)));
   }
 }
diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart
index 0e965aba7..edc646080 100644
--- a/lib/src/screens/dashboard/widgets/menu_widget.dart
+++ b/lib/src/screens/dashboard/widgets/menu_widget.dart
@@ -2,7 +2,7 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/src/screens/dashboard/wallet_menu.dart';
 import 'package:flutter/rendering.dart';
 
diff --git a/lib/src/screens/dashboard/widgets/sync_indicator.dart b/lib/src/screens/dashboard/widgets/sync_indicator.dart
index f0a0fac08..8f2cacae5 100644
--- a/lib/src/screens/dashboard/widgets/sync_indicator.dart
+++ b/lib/src/screens/dashboard/widgets/sync_indicator.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
 
 class SyncIndicator extends StatelessWidget {
   SyncIndicator({@required this.dashboardViewModel});
diff --git a/lib/src/screens/dashboard/widgets/trade_row.dart b/lib/src/screens/dashboard/widgets/trade_row.dart
index 6da7a798f..82bf2fc3e 100644
--- a/lib/src/screens/dashboard/widgets/trade_row.dart
+++ b/lib/src/screens/dashboard/widgets/trade_row.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 
 class TradeRow extends StatelessWidget {
   TradeRow({
diff --git a/lib/src/screens/dashboard/widgets/transaction_raw.dart b/lib/src/screens/dashboard/widgets/transaction_raw.dart
index 625e8028b..13e3bd2be 100644
--- a/lib/src/screens/dashboard/widgets/transaction_raw.dart
+++ b/lib/src/screens/dashboard/widgets/transaction_raw.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
+import 'package:cake_wallet/entities/transaction_direction.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class TransactionRow extends StatelessWidget {
diff --git a/lib/src/screens/exchange/widgets/base_exchange_widget.dart b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
index 99de996d3..a9e878b9a 100644
--- a/lib/src/screens/exchange/widgets/base_exchange_widget.dart
+++ b/lib/src/screens/exchange/widgets/base_exchange_widget.dart
@@ -1,5 +1,5 @@
 import 'dart:ui';
-import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
+import 'package:cake_wallet/exchange/exchange_template.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/template_tile.dart';
 import 'package:dotted_border/dotted_border.dart';
@@ -9,10 +9,10 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart';
-import 'package:cake_wallet/src/stores/exchange/exchange_trade_state.dart';
-import 'package:cake_wallet/src/stores/exchange/limits_state.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/xmrto/xmrto_exchange_provider.dart';
+// import 'package:cake_wallet/exchange/exchange_trade_state.dart';
+// import 'package:cake_wallet/exchange/limits_state.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/exchange_card.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
@@ -376,7 +376,7 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                   },
                   color: Theme.of(context).accentTextTheme.body2.color,
                   textColor: Colors.white,
-                  isLoading: exchangeViewModel.tradeState is TradeIsCreating,
+                  isLoading: false, // FIXME: FIXME exchangeViewModel.tradeState is TradeIsCreating,
                 )),
           ]),
         ));
@@ -419,18 +419,21 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
     final depositAmountController = depositKey.currentState.amountController;
     final receiveAddressController = receiveKey.currentState.addressController;
     final receiveAmountController = receiveKey.currentState.amountController;
-    final limitsState = exchangeViewModel.limitsState;
 
-    if (limitsState is LimitsLoadedSuccessfully) {
-      final min = limitsState.limits.min != null
-          ? limitsState.limits.min.toString()
-          : null;
-      final max = limitsState.limits.max != null
-          ? limitsState.limits.max.toString()
-          : null;
-      final key = depositKey;
-      key.currentState.changeLimits(min: min, max: max);
-    }
+    // FIXME: FIXME
+
+    // final limitsState = exchangeViewModel.limitsState;
+    //
+    // if (limitsState is LimitsLoadedSuccessfully) {
+    //   final min = limitsState.limits.min != null
+    //       ? limitsState.limits.min.toString()
+    //       : null;
+    //   final max = limitsState.limits.max != null
+    //       ? limitsState.limits.max.toString()
+    //       : null;
+    //   final key = depositKey;
+    //   key.currentState.changeLimits(min: min, max: max);
+    // }
 
     _onCurrencyChange(
         exchangeViewModel.receiveCurrency, exchangeViewModel, receiveKey);
@@ -491,47 +494,51 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
       receiveKey.currentState.isAddressEditable(isEditable: isEnabled);
     });
 
-    reaction((_) => exchangeViewModel.tradeState, (ExchangeTradeState state) {
-      if (state is TradeIsCreatedFailure) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          showDialog<void>(
-              context: context,
-              builder: (BuildContext context) {
-                return AlertWithOneAction(
-                    alertTitle: S.of(context).error,
-                    alertContent: state.error,
-                    buttonText: S.of(context).ok,
-                    buttonAction: () => Navigator.of(context).pop());
-              });
-        });
-      }
-      if (state is TradeIsCreatedSuccessfully) {
-        Navigator.of(context).pushNamed(Routes.exchangeConfirm);
-      }
-    });
+    // FIXME: FIXME
 
-    reaction((_) => exchangeViewModel.limitsState, (LimitsState state) {
-      String min;
-      String max;
+    // reaction((_) => exchangeViewModel.tradeState, (ExchangeTradeState state) {
+    //   if (state is TradeIsCreatedFailure) {
+    //     WidgetsBinding.instance.addPostFrameCallback((_) {
+    //       showDialog<void>(
+    //           context: context,
+    //           builder: (BuildContext context) {
+    //             return AlertWithOneAction(
+    //                 alertTitle: S.of(context).error,
+    //                 alertContent: state.error,
+    //                 buttonText: S.of(context).ok,
+    //                 buttonAction: () => Navigator.of(context).pop());
+    //           });
+    //     });
+    //   }
+    //   if (state is TradeIsCreatedSuccessfully) {
+    //     Navigator.of(context).pushNamed(Routes.exchangeConfirm);
+    //   }
+    // });
 
-      if (state is LimitsLoadedSuccessfully) {
-        min = state.limits.min != null ? state.limits.min.toString() : null;
-        max = state.limits.max != null ? state.limits.max.toString() : null;
-      }
+    // FIXME: FIXME
 
-      if (state is LimitsLoadedFailure) {
-        min = '0';
-        max = '0';
-      }
-
-      if (state is LimitsIsLoading) {
-        min = '...';
-        max = '...';
-      }
-
-      depositKey.currentState.changeLimits(min: min, max: max);
-      receiveKey.currentState.changeLimits(min: null, max: null);
-    });
+    // reaction((_) => exchangeViewModel.limitsState, (LimitsState state) {
+    //   String min;
+    //   String max;
+    //
+    //   if (state is LimitsLoadedSuccessfully) {
+    //     min = state.limits.min != null ? state.limits.min.toString() : null;
+    //     max = state.limits.max != null ? state.limits.max.toString() : null;
+    //   }
+    //
+    //   if (state is LimitsLoadedFailure) {
+    //     min = '0';
+    //     max = '0';
+    //   }
+    //
+    //   if (state is LimitsIsLoading) {
+    //     min = '...';
+    //     max = '...';
+    //   }
+    //
+    //   depositKey.currentState.changeLimits(min: min, max: max);
+    //   receiveKey.currentState.changeLimits(min: null, max: null);
+    // });
 
     depositAddressController.addListener(
         () => exchangeViewModel.depositAddress = depositAddressController.text);
diff --git a/lib/src/screens/exchange/widgets/currency_picker.dart b/lib/src/screens/exchange/widgets/currency_picker.dart
index 2cc106b2c..21ba5ce31 100644
--- a/lib/src/screens/exchange/widgets/currency_picker.dart
+++ b/lib/src/screens/exchange/widgets/currency_picker.dart
@@ -2,7 +2,7 @@ import 'dart:ui';
 import 'package:cake_wallet/palette.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/src/widgets/alert_close_button.dart';
 
diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index 9be446fb8..1836ec912 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 import 'package:cake_wallet/src/widgets/address_text_field.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
diff --git a/lib/src/screens/exchange/widgets/present_provider_picker.dart b/lib/src/screens/exchange/widgets/present_provider_picker.dart
index 24b0f73a3..b8154632e 100644
--- a/lib/src/screens/exchange/widgets/present_provider_picker.dart
+++ b/lib/src/screens/exchange/widgets/present_provider_picker.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/exchange_provider.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
diff --git a/lib/src/screens/exchange_trade/exchange_confirm_page.dart b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
index a5569453c..5e007a250 100644
--- a/lib/src/screens/exchange_trade/exchange_confirm_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
@@ -6,7 +6,7 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/exchange/trade.dart';
 
 class ExchangeConfirmPage extends BasePage {
   ExchangeConfirmPage({@required this.tradesStore}) : trade = tradesStore.trade;
diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart
index cc295a9ca..545492e09 100644
--- a/lib/src/screens/exchange_trade/exchange_trade_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/palette.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_item.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/information_page.dart';
 import 'package:cake_wallet/src/widgets/standart_list_row.dart';
@@ -12,10 +12,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/stores/exchange_trade/exchange_trade_store.dart';
-import 'package:cake_wallet/src/stores/send/send_store.dart';
-import 'package:cake_wallet/src/stores/send/sending_state.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
+// import 'package:cake_wallet/src/stores/exchange_trade/exchange_trade_store.dart';
+// import 'package:cake_wallet/src/stores/send/send_store.dart';
+// import 'package:cake_wallet/src/stores/send/sending_state.dart';
+// import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/qr_image.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/widgets/timer_widget.dart';
diff --git a/lib/src/screens/faq/faq_page.dart b/lib/src/screens/faq/faq_page.dart
index 70fbaa6d2..b68c95732 100644
--- a/lib/src/screens/faq/faq_page.dart
+++ b/lib/src/screens/faq/faq_page.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 
 class FaqPage extends BasePage {
@@ -124,35 +124,37 @@ class FaqFormState extends State<FaqForm> {
   }
 
   String getFaqPath(BuildContext context) {
-    final settingsStore = Provider.of<SettingsStore>(context);
-
-    switch (settingsStore.languageCode) {
-      case 'en':
-        return 'assets/faq/faq_en.json';
-      case 'uk':
-        return 'assets/faq/faq_uk.json';
-      case 'ru':
-        return 'assets/faq/faq_ru.json';
-      case 'es':
-        return 'assets/faq/faq_es.json';
-      case 'ja':
-        return 'assets/faq/faq_ja.json';
-      case 'ko':
-        return 'assets/faq/faq_ko.json';
-      case 'hi':
-        return 'assets/faq/faq_hi.json';
-      case 'de':
-        return 'assets/faq/faq_de.json';
-      case 'zh':
-        return 'assets/faq/faq_zh.json';
-      case 'pt':
-        return 'assets/faq/faq_pt.json';
-      case 'pl':
-        return 'assets/faq/faq_pl.json';
-      case 'nl':
-        return 'assets/faq/faq_nl.json';
-      default:
-        return 'assets/faq/faq_en.json';
-    }
+    // FIXME: FIXME
+    // final settingsStore = Provider.of<SettingsStore>(context);
+    //
+    // switch (settingsStore.languageCode) {
+    //   case 'en':
+    //     return 'assets/faq/faq_en.json';
+    //   case 'uk':
+    //     return 'assets/faq/faq_uk.json';
+    //   case 'ru':
+    //     return 'assets/faq/faq_ru.json';
+    //   case 'es':
+    //     return 'assets/faq/faq_es.json';
+    //   case 'ja':
+    //     return 'assets/faq/faq_ja.json';
+    //   case 'ko':
+    //     return 'assets/faq/faq_ko.json';
+    //   case 'hi':
+    //     return 'assets/faq/faq_hi.json';
+    //   case 'de':
+    //     return 'assets/faq/faq_de.json';
+    //   case 'zh':
+    //     return 'assets/faq/faq_zh.json';
+    //   case 'pt':
+    //     return 'assets/faq/faq_pt.json';
+    //   case 'pl':
+    //     return 'assets/faq/faq_pl.json';
+    //   case 'nl':
+    //     return 'assets/faq/faq_nl.json';
+    //   default:
+    //     return 'assets/faq/faq_en.json';
+    // }
+    return '';
   }
 }
\ No newline at end of file
diff --git a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
index ca2b65359..002b264ba 100644
--- a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
+++ b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
@@ -1,9 +1,9 @@
+import 'package:cake_wallet/core/execution_state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/monero_account_label_validator.dart';
-import 'package:cake_wallet/view_model/monero_account_list/monero_account_edit_or_create_state.dart';
 import 'package:cake_wallet/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
@@ -59,7 +59,7 @@ class MoneroAccountEditOrCreatePage extends BasePage {
                         color: Colors.green,
                         textColor: Colors.white,
                         isLoading: moneroAccountCreationViewModel.state
-                        is AccountIsCreating,
+                        is IsExecutingState,
                         isDisabled:
                         moneroAccountCreationViewModel.label?.isEmpty ?? true,
                       ))
diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart
index 027bbbb7b..9512a3753 100644
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@@ -13,7 +13,7 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/screens/seed_language/widgets/seed_language_picker.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/view_model/wallet_creation_state.dart';
+import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/view_model/wallet_new_vm.dart';
 
 class NewWalletPage extends BasePage {
@@ -43,7 +43,8 @@ class _WalletNameFormState extends State<WalletNameForm> {
   static const aspectRatioImage = 1.22;
 
   final walletNameImage = Image.asset('assets/images/wallet_name.png');
-  final walletNameLightImage = Image.asset('assets/images/wallet_name_light.png');
+  final walletNameLightImage =
+      Image.asset('assets/images/wallet_name_light.png');
   final _formKey = GlobalKey<FormState>();
   final _languageSelectorKey = GlobalKey<SeedLanguageSelectorState>();
   ReactionDisposer _stateReaction;
@@ -52,12 +53,12 @@ class _WalletNameFormState extends State<WalletNameForm> {
   @override
   void initState() {
     _stateReaction ??=
-        reaction((_) => _walletNewVM.state, (WalletCreationState state) {
-      if (state is WalletCreatedSuccessfully) {
-        Navigator.of(context).popAndPushNamed(Routes.seed, arguments: true);
+        reaction((_) => _walletNewVM.state, (ExecutionState state) {
+      if (state is ExecutedSuccessfullyState) {
+        Navigator.of(context).pushNamed(Routes.seed, arguments: true);
       }
 
-      if (state is WalletCreationFailure) {
+      if (state is FailureState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           showDialog<void>(
               context: context,
@@ -77,7 +78,8 @@ class _WalletNameFormState extends State<WalletNameForm> {
   @override
   Widget build(BuildContext context) {
     final walletImage = getIt.get<SettingsStore>().isDarkTheme
-        ? walletNameImage : walletNameLightImage;
+        ? walletNameImage
+        : walletNameLightImage;
 
     return Container(
       padding: EdgeInsets.only(top: 24),
@@ -158,7 +160,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
                 text: S.of(context).seed_language_next,
                 color: Colors.green,
                 textColor: Colors.white,
-                isLoading: _walletNewVM.state is WalletCreatedSuccessfully,
+                isLoading: _walletNewVM.state is IsExecutingState,
                 isDisabled: _walletNewVM.name.isEmpty,
               );
             },
diff --git a/lib/src/screens/new_wallet/new_wallet_type_page.dart b/lib/src/screens/new_wallet/new_wallet_type_page.dart
index 0eacbc7b7..cf3b3b896 100644
--- a/lib/src/screens/new_wallet/new_wallet_type_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart
@@ -1,5 +1,5 @@
 import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
diff --git a/lib/src/screens/pin_code/pin_code.dart b/lib/src/screens/pin_code/pin_code.dart
index 392705b52..02a917531 100644
--- a/lib/src/screens/pin_code/pin_code.dart
+++ b/lib/src/screens/pin_code/pin_code.dart
@@ -1,301 +1,20 @@
-import 'package:provider/provider.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/biometric_auth.dart';
-
-abstract class PinCodeWidget extends StatefulWidget {
-  PinCodeWidget({Key key, this.onPinCodeEntered, this.hasLengthSwitcher})
-      : super(key: key);
-
-  final Function(List<int> pin, PinCodeState state) onPinCodeEntered;
-  final bool hasLengthSwitcher;
-}
+import 'package:flutter/foundation.dart';
+import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
 
 class PinCode extends PinCodeWidget {
-  PinCode(Function(List<int> pin, PinCodeState state) onPinCodeEntered,
-      bool hasLengthSwitcher, Key key)
+  PinCode(
+      void Function(String pin, PinCodeState state) onFullPin,
+      void Function(String pin) onChangedPin,
+      int initialPinLength,
+      bool hasLengthSwitcher,
+      Key key)
       : super(
             key: key,
-            onPinCodeEntered: onPinCodeEntered,
-            hasLengthSwitcher: hasLengthSwitcher);
+            onFullPin: onFullPin,
+            onChangedPin: onChangedPin,
+            hasLengthSwitcher: hasLengthSwitcher,
+            initialPinLength: initialPinLength);
 
   @override
   PinCodeState createState() => PinCodeState();
 }
-
-class PinCodeState<T extends PinCodeWidget> extends State<T> {
-  static const defaultPinLength = 4;
-  static const sixPinLength = 6;
-  static const fourPinLength = 4;
-  final _gridViewKey = GlobalKey();
-  final _key = GlobalKey<ScaffoldState>();
-
-  int pinLength = defaultPinLength;
-  List<int> pin = List<int>.filled(defaultPinLength, null);
-  String title = S.current.enter_your_pin;
-  double _aspectRatio = 0;
-
-  void setTitle(String title) => setState(() => this.title = title);
-
-  void clear() => setState(() => pin = List<int>.filled(pinLength, null));
-
-  void onPinCodeEntered(PinCodeState state) =>
-      widget.onPinCodeEntered(state.pin, this);
-
-  void changePinLength(int length) {
-    final newPin = List<int>.filled(length, null);
-
-    setState(() {
-      pinLength = length;
-      pin = newPin;
-    });
-  }
-
-  void setDefaultPinLength() {
-    final settingsStore = Provider.of<SettingsStore>(context);
-
-    pinLength = settingsStore.defaultPinLength;
-    changePinLength(pinLength);
-  }
-
-  void calculateAspectRatio() {
-    final renderBox =
-        _gridViewKey.currentContext.findRenderObject() as RenderBox;
-    final cellWidth = renderBox.size.width / 3;
-    final cellHeight = renderBox.size.height / 4;
-
-    if (cellWidth > 0 && cellHeight > 0) {
-      _aspectRatio = cellWidth / cellHeight;
-    }
-
-    setState(() {});
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback(afterLayout);
-  }
-
-  void afterLayout(dynamic _) {
-    setDefaultPinLength();
-    calculateAspectRatio();
-  }
-
-  @override
-  Widget build(BuildContext context) =>
-      Scaffold(key: _key, body: body(context));
-
-  Widget body(BuildContext context) {
-    final settingsStore = Provider.of<SettingsStore>(context);
-
-    final deleteIconImage = Image.asset(
-      'assets/images/delete_icon.png',
-      color: Theme.of(context).primaryTextTheme.title.color,
-    );
-    final faceImage = Image.asset(
-      'assets/images/face.png',
-      color: Theme.of(context).primaryTextTheme.title.color,
-    );
-
-    return Container(
-      color: Theme.of(context).backgroundColor,
-      padding: EdgeInsets.only(left: 40.0, right: 40.0, bottom: 40.0),
-      child: Column(children: <Widget>[
-        Spacer(flex: 2),
-        Text(title,
-            style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-                color: Theme.of(context).primaryTextTheme.title.color)),
-        Spacer(flex: 3),
-        Container(
-          width: 180,
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: List.generate(pinLength, (index) {
-              const size = 10.0;
-              final isFilled = pin[index] != null;
-
-              return Container(
-                  width: size,
-                  height: size,
-                  decoration: BoxDecoration(
-                    shape: BoxShape.circle,
-                    color: isFilled
-                        ? Theme.of(context).primaryTextTheme.title.color
-                        : Theme.of(context)
-                            .accentTextTheme
-                            .body1
-                            .color
-                            .withOpacity(0.25),
-                  ));
-            }),
-          ),
-        ),
-        Spacer(flex: 2),
-        if (widget.hasLengthSwitcher) ...[
-          FlatButton(
-              onPressed: () {
-                changePinLength(pinLength == PinCodeState.fourPinLength
-                    ? PinCodeState.sixPinLength
-                    : PinCodeState.fourPinLength);
-              },
-              child: Text(
-                _changePinLengthText(),
-                style: TextStyle(
-                    fontSize: 14.0,
-                    fontWeight: FontWeight.normal,
-                    color: Theme.of(context)
-                        .accentTextTheme
-                        .body1
-                        .decorationColor),
-              ))
-        ],
-        Spacer(flex: 1),
-        Flexible(
-            flex: 24,
-            child: Container(
-                key: _gridViewKey,
-                child: _aspectRatio > 0
-                    ? GridView.count(
-                        shrinkWrap: true,
-                        crossAxisCount: 3,
-                        childAspectRatio: _aspectRatio,
-                        physics: const NeverScrollableScrollPhysics(),
-                        children: List.generate(12, (index) {
-                          const double marginRight = 15;
-                          const double marginLeft = 15;
-
-                          if (index == 9) {
-                            return Container(
-                              margin: EdgeInsets.only(
-                                  left: marginLeft, right: marginRight),
-                              child: FlatButton(
-                                onPressed: (widget.hasLengthSwitcher ||
-                                        !settingsStore
-                                            .allowBiometricalAuthentication)
-                                    ? null
-                                    : () {
-                                        // FIXME
-//                                        if (authStore != null) {
-//                                          WidgetsBinding.instance.addPostFrameCallback((_) {
-//                                            final biometricAuth = BiometricAuth();
-//                                            biometricAuth.isAuthenticated().then(
-//                                                    (isAuth) {
-//                                                  if (isAuth) {
-//                                                    authStore.biometricAuth();
-//                                                    _key.currentState.showSnackBar(
-//                                                      SnackBar(
-//                                                        content: Text(S.of(context).authenticated),
-//                                                        backgroundColor: Colors.green,
-//                                                      ),
-//                                                    );
-//                                                  }
-//                                                }
-//                                            );
-//                                          });
-//                                        }
-                                      },
-                                color: Theme.of(context).backgroundColor,
-                                shape: CircleBorder(),
-                                child: (widget.hasLengthSwitcher ||
-                                        !settingsStore
-                                            .allowBiometricalAuthentication)
-                                    ? Offstage()
-                                    : faceImage,
-                              ),
-                            );
-                          } else if (index == 10) {
-                            index = 0;
-                          } else if (index == 11) {
-                            return Container(
-                              margin: EdgeInsets.only(
-                                  left: marginLeft, right: marginRight),
-                              child: FlatButton(
-                                onPressed: () => _pop(),
-                                color: Theme.of(context).backgroundColor,
-                                shape: CircleBorder(),
-                                child: deleteIconImage,
-                              ),
-                            );
-                          } else {
-                            index++;
-                          }
-
-                          return Container(
-                            margin: EdgeInsets.only(
-                                left: marginLeft, right: marginRight),
-                            child: FlatButton(
-                              onPressed: () => _push(index),
-                              color: Theme.of(context).backgroundColor,
-                              shape: CircleBorder(),
-                              child: Text('$index',
-                                  style: TextStyle(
-                                      fontSize: 30.0,
-                                      fontWeight: FontWeight.w600,
-                                      color: Theme.of(context)
-                                          .primaryTextTheme
-                                          .title
-                                          .color)),
-                            ),
-                          );
-                        }),
-                      )
-                    : null))
-      ]),
-    );
-  }
-
-  void _push(int num) {
-    if (currentPinLength() >= pinLength) {
-      return;
-    }
-
-    for (var i = 0; i < pin.length; i++) {
-      if (pin[i] == null) {
-        setState(() => pin[i] = num);
-        break;
-      }
-    }
-
-    final _currentPinLength = currentPinLength();
-
-    if (_currentPinLength == pinLength) {
-      onPinCodeEntered(this);
-    }
-  }
-
-  void _pop() {
-    if (currentPinLength() == 0) {
-      return;
-    }
-
-    for (var i = pin.length - 1; i >= 0; i--) {
-      if (pin[i] != null) {
-        setState(() => pin[i] = null);
-        break;
-      }
-    }
-  }
-
-  int currentPinLength() {
-    return pin.fold(0, (v, e) {
-      if (e != null) {
-        return v + 1;
-      }
-
-      return v;
-    });
-  }
-
-  String _changePinLengthText() {
-    return S.current.use +
-        (pinLength == PinCodeState.fourPinLength
-            ? '${PinCodeState.sixPinLength}'
-            : '${PinCodeState.fourPinLength}') +
-        S.current.digit_pin;
-  }
-}
diff --git a/lib/src/screens/pin_code/pin_code_widget.dart b/lib/src/screens/pin_code/pin_code_widget.dart
new file mode 100644
index 000000000..e4e17dae3
--- /dev/null
+++ b/lib/src/screens/pin_code/pin_code_widget.dart
@@ -0,0 +1,284 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+
+class PinCodeWidget extends StatefulWidget {
+  PinCodeWidget(
+      {Key key,
+      @required this.onFullPin,
+      @required this.initialPinLength,
+      this.onChangedPin,
+      this.onChangedPinLength,
+      this.hasLengthSwitcher})
+      : super(key: key);
+
+  final void Function(String pin, PinCodeState state) onFullPin;
+  final void Function(String pin) onChangedPin;
+  final void Function(int length) onChangedPinLength;
+  final bool hasLengthSwitcher;
+  final int initialPinLength;
+
+  @override
+  State<StatefulWidget> createState() => PinCodeState();
+}
+
+class PinCodeState<T extends PinCodeWidget> extends State<T> {
+  static const defaultPinLength = fourPinLength;
+  static const sixPinLength = 6;
+  static const fourPinLength = 4;
+  final _gridViewKey = GlobalKey();
+  final _key = GlobalKey<ScaffoldState>();
+
+  int pinLength;
+  String pin;
+  String title;
+  double _aspectRatio;
+
+  int currentPinLength() => pin.length;
+
+  @override
+  void initState() {
+    super.initState();
+    pinLength = widget.initialPinLength;
+    pin = '';
+    title = S.current.enter_your_pin;
+    _aspectRatio = 0;
+    WidgetsBinding.instance.addPostFrameCallback(_afterLayout);
+  }
+
+  void setTitle(String title) => setState(() => this.title = title);
+
+  void clear() => setState(() => pin = '');
+
+  void reset() => setState(() {
+        pin = '';
+        pinLength = widget.initialPinLength;
+        title = S.current.enter_your_pin;
+      });
+
+  void changePinLength(int length) {
+    setState(() {
+      pinLength = length;
+      pin = '';
+    });
+
+    widget.onChangedPinLength?.call(length);
+  }
+
+  void setDefaultPinLength() => changePinLength(widget.initialPinLength);
+
+  void calculateAspectRatio() {
+    final renderBox =
+        _gridViewKey.currentContext.findRenderObject() as RenderBox;
+    final cellWidth = renderBox.size.width / 3;
+    final cellHeight = renderBox.size.height / 4;
+
+    if (cellWidth > 0 && cellHeight > 0) {
+      _aspectRatio = cellWidth / cellHeight;
+    }
+
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) =>
+      Scaffold(key: _key, body: body(context));
+
+  Widget body(BuildContext context) {
+    final deleteIconImage = Image.asset(
+      'assets/images/delete_icon.png',
+      color: Theme.of(context).primaryTextTheme.title.color,
+    );
+    final faceImage = Image.asset(
+      'assets/images/face.png',
+      color: Theme.of(context).primaryTextTheme.title.color,
+    );
+
+    return Container(
+      color: Theme.of(context).backgroundColor,
+      padding: EdgeInsets.only(left: 40.0, right: 40.0, bottom: 40.0),
+      child: Column(children: <Widget>[
+        Spacer(flex: 2),
+        Text(title,
+            style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.w500,
+                color: Theme.of(context).primaryTextTheme.title.color)),
+        Spacer(flex: 3),
+        Container(
+          width: 180,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: List.generate(pinLength, (index) {
+              const size = 10.0;
+              final isFilled = pin.length > index ? pin[index] != null : false;
+
+              return Container(
+                  width: size,
+                  height: size,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: isFilled
+                        ? Theme.of(context).primaryTextTheme.title.color
+                        : Theme.of(context)
+                            .accentTextTheme
+                            .body1
+                            .color
+                            .withOpacity(0.25),
+                  ));
+            }),
+          ),
+        ),
+        Spacer(flex: 2),
+        if (widget.hasLengthSwitcher) ...[
+          FlatButton(
+              onPressed: () {
+                changePinLength(pinLength == PinCodeState.fourPinLength
+                    ? PinCodeState.sixPinLength
+                    : PinCodeState.fourPinLength);
+              },
+              child: Text(
+                _changePinLengthText(),
+                style: TextStyle(
+                    fontSize: 14.0,
+                    fontWeight: FontWeight.normal,
+                    color: Theme.of(context)
+                        .accentTextTheme
+                        .body1
+                        .decorationColor),
+              ))
+        ],
+        Spacer(flex: 1),
+        Flexible(
+            flex: 24,
+            child: Container(
+                key: _gridViewKey,
+                child: _aspectRatio > 0
+                    ? GridView.count(
+                        shrinkWrap: true,
+                        crossAxisCount: 3,
+                        childAspectRatio: _aspectRatio,
+                        physics: const NeverScrollableScrollPhysics(),
+                        children: List.generate(12, (index) {
+                          const double marginRight = 15;
+                          const double marginLeft = 15;
+
+                          if (index == 9) {
+                            return Container(
+                              margin: EdgeInsets.only(
+                                  left: marginLeft, right: marginRight),
+                              child: FlatButton(
+                                  onPressed: () => null,
+                                  // (widget.hasLengthSwitcher ||
+                                  //         !settingsStore
+                                  //             .allowBiometricalAuthentication)
+                                  //     ? null
+                                  //     : () {
+                                  // FIXME
+//                                        if (authStore != null) {
+//                                          WidgetsBinding.instance.addPostFrameCallback((_) {
+//                                            final biometricAuth = BiometricAuth();
+//                                            biometricAuth.isAuthenticated().then(
+//                                                    (isAuth) {
+//                                                  if (isAuth) {
+//                                                    authStore.biometricAuth();
+//                                                    _key.currentState.showSnackBar(
+//                                                      SnackBar(
+//                                                        content: Text(S.of(context).authenticated),
+//                                                        backgroundColor: Colors.green,
+//                                                      ),
+//                                                    );
+//                                                  }
+//                                                }
+//                                            );
+//                                          });
+//                                        }
+//                                       },
+                                  color: Theme.of(context).backgroundColor,
+                                  shape: CircleBorder(),
+                                  child: null
+                                  // (widget.hasLengthSwitcher ||
+                                  //         !settingsStore
+                                  //             .allowBiometricalAuthentication)
+                                  //     ? Offstage()
+                                  //     : faceImage,
+                                  ),
+                            );
+                          } else if (index == 10) {
+                            index = 0;
+                          } else if (index == 11) {
+                            return Container(
+                              margin: EdgeInsets.only(
+                                  left: marginLeft, right: marginRight),
+                              child: FlatButton(
+                                onPressed: () => _pop(),
+                                color: Theme.of(context).backgroundColor,
+                                shape: CircleBorder(),
+                                child: deleteIconImage,
+                              ),
+                            );
+                          } else {
+                            index++;
+                          }
+
+                          return Container(
+                            margin: EdgeInsets.only(
+                                left: marginLeft, right: marginRight),
+                            child: FlatButton(
+                              onPressed: () => _push(index),
+                              color: Theme.of(context).backgroundColor,
+                              shape: CircleBorder(),
+                              child: Text('$index',
+                                  style: TextStyle(
+                                      fontSize: 30.0,
+                                      fontWeight: FontWeight.w600,
+                                      color: Theme.of(context)
+                                          .primaryTextTheme
+                                          .title
+                                          .color)),
+                            ),
+                          );
+                        }),
+                      )
+                    : null))
+      ]),
+    );
+  }
+
+  void _push(int num) {
+    setState(() {
+      if (currentPinLength() >= pinLength) {
+        return;
+      }
+
+      pin += num.toString();
+
+      widget.onChangedPin(pin);
+
+      if (pin.length == pinLength) {
+        widget.onFullPin(pin, this);
+      }
+    });
+  }
+
+  void _pop() {
+    if (currentPinLength() == 0) {
+      return;
+    }
+
+    pin.substring(0, pin.length - 1);
+  }
+
+  String _changePinLengthText() {
+    return S.current.use +
+        (pinLength == PinCodeState.fourPinLength
+            ? '${PinCodeState.sixPinLength}'
+            : '${PinCodeState.fourPinLength}') +
+        S.current.digit_pin;
+  }
+
+  void _afterLayout(dynamic _) {
+    setDefaultPinLength();
+    calculateAspectRatio();
+  }
+}
diff --git a/lib/src/screens/rescan/rescan_page.dart b/lib/src/screens/rescan/rescan_page.dart
index ca6af90fa..9bfe1df2f 100644
--- a/lib/src/screens/rescan/rescan_page.dart
+++ b/lib/src/screens/rescan/rescan_page.dart
@@ -1,38 +1,41 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:provider/provider.dart';
+import 'package:cake_wallet/view_model/rescan_view_model.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/blockchain_height_widget.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/stores/rescan/rescan_wallet_store.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class RescanPage extends BasePage {
-  final blockchainKey = GlobalKey<BlockchainHeightState>();
+  RescanPage(this._rescanViewModel)
+      : _blockchainHeightWidgetKey = GlobalKey<BlockchainHeightState>();
+
   @override
   String get title => S.current.rescan;
+  final GlobalKey<BlockchainHeightState> _blockchainHeightWidgetKey;
+  final RescanViewModel _rescanViewModel;
 
   @override
   Widget body(BuildContext context) {
-    final rescanWalletStore = Provider.of<RescanWalletStore>(context);
-
     return Padding(
       padding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
       child:
           Column(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
-        BlockchainHeightWidget(key: blockchainKey),
+        BlockchainHeightWidget(key: _blockchainHeightWidgetKey),
         Observer(
             builder: (_) => LoadingPrimaryButton(
-                isLoading:
-                    rescanWalletStore.state == RescanWalletState.rescaning,
-                text: S.of(context).rescan,
-                onPressed: () async {
-                  await rescanWalletStore.rescanCurrentWallet(
-                      restoreHeight: blockchainKey.currentState.height);
-                  Navigator.of(context).pop();
-                },
-                color: Colors.blue,
-                textColor: Colors.white,))
+                  isLoading:
+                      _rescanViewModel.state == RescanWalletState.rescaning,
+                  text: S.of(context).rescan,
+                  onPressed: () async {
+                    await _rescanViewModel.rescanCurrentWallet(
+                        restoreHeight:
+                            _blockchainHeightWidgetKey.currentState.height);
+                    Navigator.of(context).pop();
+                  },
+                  color: Colors.blue,
+                  textColor: Colors.white,
+                ))
       ]),
     );
   }
diff --git a/lib/src/screens/restore/restore_options_page.dart b/lib/src/screens/restore/restore_options_page.dart
index 33b96b391..bce520170 100644
--- a/lib/src/screens/restore/restore_options_page.dart
+++ b/lib/src/screens/restore/restore_options_page.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/routes.dart';
diff --git a/lib/src/screens/restore/restore_wallet_from_seed_details.dart b/lib/src/screens/restore/restore_wallet_from_seed_details.dart
index 79b238411..5469a9f58 100644
--- a/lib/src/screens/restore/restore_wallet_from_seed_details.dart
+++ b/lib/src/screens/restore/restore_wallet_from_seed_details.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/validator.dart';
-import 'package:cake_wallet/view_model/wallet_creation_state.dart';
+import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/blockchain_height_widget.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
@@ -46,12 +46,12 @@ class _RestoreFromSeedDetailsFormState
   @override
   void initState() {
     _stateReaction = reaction((_) => widget.walletRestorationFromSeedVM.state,
-        (WalletCreationState state) {
-      if (state is WalletCreatedSuccessfully) {
+        (ExecutionState state) {
+      if (state is ExecutedSuccessfullyState) {
         Navigator.of(context).popUntil((route) => route.isFirst);
       }
 
-      if (state is WalletCreationFailure) {
+      if (state is FailureState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           showDialog<void>(
               context: context,
@@ -131,7 +131,7 @@ class _RestoreFromSeedDetailsFormState
               }
             },
             isLoading:
-                widget.walletRestorationFromSeedVM.state is WalletCreating,
+                widget.walletRestorationFromSeedVM.state is IsExecutingState,
             text: S.of(context).restore_recover,
             color: Theme.of(context).accentTextTheme.body2.color,
             textColor: Colors.white,
diff --git a/lib/src/screens/restore/restore_wallet_from_seed_page.dart b/lib/src/screens/restore/restore_wallet_from_seed_page.dart
index 2920818f6..ec60ea246 100644
--- a/lib/src/screens/restore/restore_wallet_from_seed_page.dart
+++ b/lib/src/screens/restore/restore_wallet_from_seed_page.dart
@@ -4,7 +4,7 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/seed_widget.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/core/seed_validator.dart';
 import 'package:cake_wallet/core/mnemonic_length.dart';
 
diff --git a/lib/src/screens/restore/restore_wallet_options_page.dart b/lib/src/screens/restore/restore_wallet_options_page.dart
index 750a9c7e0..4ae5e491b 100644
--- a/lib/src/screens/restore/restore_wallet_options_page.dart
+++ b/lib/src/screens/restore/restore_wallet_options_page.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/screens/restore/widgets/restore_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class RestoreWalletOptionsPage extends BasePage {
diff --git a/lib/src/screens/root/root.dart b/lib/src/screens/root/root.dart
index c1d289f70..7b3032513 100644
--- a/lib/src/screens/root/root.dart
+++ b/lib/src/screens/root/root.dart
@@ -1,28 +1,9 @@
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/src/screens/dashboard/dashboard_page.dart';
-import 'package:cake_wallet/store/app_store.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:hive/hive.dart';
-import 'package:provider/provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/store/authentication_store.dart';
-
-//import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
-import 'package:cake_wallet/src/stores/price/price_store.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/domain/common/qr_scanner.dart';
-import 'package:cake_wallet/src/domain/services/user_service.dart';
-import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/monero/transaction_description.dart';
-import 'package:cake_wallet/src/screens/auth/create_login_page.dart';
-import 'package:cake_wallet/src/screens/dashboard/create_dashboard_page.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
-import 'package:cake_wallet/src/screens/welcome/create_welcome_page.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/store/authentication_store.dart';
+import 'package:cake_wallet/entities/qr_scanner.dart';
 
 class Root extends StatefulWidget {
   Root({Key key, this.authenticationStore, this.appStore, this.child})
@@ -39,18 +20,12 @@ class Root extends StatefulWidget {
 class RootState extends State<Root> with WidgetsBindingObserver {
   bool _isInactive;
   bool _postFrameCallback;
-  // GlobalKey<NavigatorState> _navKey;
 
   @override
   void initState() {
     _isInactive = false;
     _postFrameCallback = false;
     WidgetsBinding.instance.addObserver(this);
-
-    // WidgetsBinding.instance.addPostFrameCallback((_) {
-    //   _navKey.currentState.pushNamed(Routes.login);
-    // });
-
     super.initState();
   }
 
@@ -62,12 +37,10 @@ class RootState extends State<Root> with WidgetsBindingObserver {
           return;
         }
 
-//        if (!_isInactive &&
-//                widget.authenticationStore.state ==
-//                    AuthenticationState.authenticated ||
-//            widget.authenticationStore.state == AuthenticationState.active) {
-//          setState(() => _isInactive = true);
-//        }
+        if (!_isInactive &&
+            widget.authenticationStore.state == AuthenticationState.allowed) {
+          setState(() => _isInactive = true);
+        }
 
         break;
       default:
@@ -77,108 +50,28 @@ class RootState extends State<Root> with WidgetsBindingObserver {
 
   @override
   Widget build(BuildContext context) {
+    if (_isInactive && !_postFrameCallback) {
+      _postFrameCallback = true;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        Navigator.of(context).pushNamed(Routes.unlock,
+            arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) {
+          if (!isAuthenticatedSuccessfully) {
+            return;
+          }
+
+          _reset();
+          auth.close();
+        });
+      });
+    }
+
     return widget.child;
+  }
 
-//    _authenticationStore = Provider.of<AuthenticationStore>(context);
-//    final sharedPreferences = Provider.of<SharedPreferences>(context);
-//    final walletListService = Provider.of<WalletListService>(context);
-//    final walletService = Provider.of<WalletService>(context);
-//    final userService = Provider.of<UserService>(context);
-//    final priceStore = Provider.of<PriceStore>(context);
-//    final authenticationStore = Provider.of<AuthenticationStore>(context);
-//    final trades = Provider.of<Box<Trade>>(context);
-//    final transactionDescriptions =
-//        Provider.of<Box<TransactionDescription>>(context);
-//    final walletStore = Provider.of<WalletStore>(context);
-//    final settingsStore = Provider.of<SettingsStore>(context);
-
-    // if (_isInactive && !_postFrameCallback) {
-    //   _postFrameCallback = true;
-
-    //   WidgetsBinding.instance.addPostFrameCallback((_) {
-    //     Navigator.of(context).pushNamed(Routes.unlock,
-    //         arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) {
-    //       if (!isAuthenticatedSuccessfully) {
-    //         return;
-    //       }
-
-    //       setState(() {
-    //         _postFrameCallback = false;
-    //         _isInactive = false;
-    //       });
-    //       auth.close();
-    //     });
-    //   });
-    // }
-
-    // return Navigator(
-    //   key: _navKey,
-    //   initialRoute: Routes.welcome,
-    //   onGenerateRoute: Router.generateRoute(
-    //         sharedPreferences: sharedPreferences,
-    //         walletListService: walletListService,
-    //         walletService: walletService,
-    //         userService: userService,
-    //         settings: settings,
-    //         priceStore: priceStore,
-    //         walletStore: walletStore,
-    //         syncStore: syncStore,
-    //         balanceStore: balanceStore,
-    //         settingsStore: settingsStore,
-    //         contacts: contacts,
-    //         nodes: nodes,
-    //         trades: trades,
-    //         transactionDescriptions: transactionDescriptions),
-    // );
-
-    // return Observer(builder: (_) {
-    //   final state = widget.authenticationStore.state;
-
-    //   if (state == AuthenticationState.denied) {
-    //     return createWelcomePage();
-    //   }
-
-    //   if (state == AuthenticationState.installed) {
-    //     return getIt.get<AuthPage>(instanceName: 'login');
-    //   }
-
-    //   if (state == AuthenticationState.allowed) {
-    //     return getIt.get<DashboardPage>();
-    //   }
-
-//      if (state == AuthenticationState.denied) {
-//        return createWelcomePage();
-//      }
-
-//      if (state == AuthenticationState.readyToLogin) {
-//        return createLoginPage(
-//            sharedPreferences: sharedPreferences,
-//            userService: userService,
-//            walletService: walletService,
-//            walletListService: walletListService,
-//            authenticationStore: authenticationStore);
-//      }
-
-//      if (state == AuthenticationState.authenticated ||
-//          state == AuthenticationState.restored) {
-//        return createDashboardPage(
-//            walletService: walletService,
-//            priceStore: priceStore,
-//            trades: trades,
-//            transactionDescriptions: transactionDescriptions,
-//            walletStore: walletStore,
-//            settingsStore: settingsStore);
-//      }
-
-//      if (state == AuthenticationState.created) {
-//        return createSeedPage(
-//            settingsStore: settingsStore,
-//            walletService: walletService,
-//            callback: () =>
-//                _authenticationStore.state = AuthenticationState.authenticated);
-//      }
-
-    // return Container(color: Colors.white);
-    // });
+  void _reset() {
+    setState(() {
+      _postFrameCallback = false;
+      _isInactive = false;
+    });
   }
 }
diff --git a/lib/src/screens/seed/wallet_seed_page.dart b/lib/src/screens/seed/wallet_seed_page.dart
index 29401cdc0..ed5746d55 100644
--- a/lib/src/screens/seed/wallet_seed_page.dart
+++ b/lib/src/screens/seed/wallet_seed_page.dart
@@ -24,10 +24,9 @@ class WalletSeedPage extends BasePage {
   final WalletSeedViewModel walletSeedViewModel;
 
   @override
-  void onClose(BuildContext context) =>
-      isNewWalletCreated
-          ? Navigator.of(context).popUntil((route) => route.isFirst)
-          : Navigator.of(context).pop();
+  void onClose(BuildContext context) => isNewWalletCreated
+      ? Navigator.of(context).popUntil((route) => route.isFirst)
+      : Navigator.of(context).pop();
 
   @override
   Widget leading(BuildContext context) =>
@@ -60,7 +59,8 @@ class WalletSeedPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    final image = getIt.get<SettingsStore>().isDarkTheme ? imageDark : imageLight;
+    final image =
+        getIt.get<SettingsStore>().isDarkTheme ? imageDark : imageLight;
 
     return Container(
         padding: EdgeInsets.all(24),
@@ -93,7 +93,8 @@ class WalletSeedPage extends BasePage {
                                       .color),
                             ),
                             Padding(
-                              padding: EdgeInsets.only(top: 20, left: 16, right: 16),
+                              padding:
+                                  EdgeInsets.only(top: 20, left: 16, right: 16),
                               child: Text(
                                 walletSeedViewModel.seed,
                                 textAlign: TextAlign.center,
@@ -113,58 +114,63 @@ class WalletSeedPage extends BasePage {
                     Column(
                       children: <Widget>[
                         isNewWalletCreated
-                        ? Padding(
-                          padding: EdgeInsets.only(bottom: 52, left: 43, right: 43),
-                          child: Text(
-                            S.of(context).seed_reminder,
-                            textAlign: TextAlign.center,
-                            style: TextStyle(
-                              fontSize: 12,
-                              fontWeight: FontWeight.normal,
-                              color: Theme.of(context)
-                                  .primaryTextTheme
-                                  .overline
-                                  .color
-                            ),
-                          ),
-                        )
-                        : Offstage(),
+                            ? Padding(
+                                padding: EdgeInsets.only(
+                                    bottom: 52, left: 43, right: 43),
+                                child: Text(
+                                  S.of(context).seed_reminder,
+                                  textAlign: TextAlign.center,
+                                  style: TextStyle(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.normal,
+                                      color: Theme.of(context)
+                                          .primaryTextTheme
+                                          .overline
+                                          .color),
+                                ),
+                              )
+                            : Offstage(),
                         Row(
                           mainAxisSize: MainAxisSize.max,
                           children: <Widget>[
                             Flexible(
                                 child: Container(
-                                  padding: EdgeInsets.only(right: 8.0),
-                                  child: PrimaryButton(
-                                      onPressed: () => Share.text(
-                                          S.of(context).seed_share,
-                                          walletSeedViewModel.seed,
-                                          'text/plain'),
-                                      text: S.of(context).save,
-                                      color: Colors.green,
-                                      textColor: Colors.white),
-                                )),
+                              padding: EdgeInsets.only(right: 8.0),
+                              child: PrimaryButton(
+                                  onPressed: () => Share.text(
+                                      S.of(context).seed_share,
+                                      walletSeedViewModel.seed,
+                                      'text/plain'),
+                                  text: S.of(context).save,
+                                  color: Colors.green,
+                                  textColor: Colors.white),
+                            )),
                             Flexible(
                                 child: Container(
-                                  padding: EdgeInsets.only(left: 8.0),
-                                  child: Builder(
-                                      builder: (context) => PrimaryButton(
-                                          onPressed: () {
-                                            Clipboard.setData(ClipboardData(
-                                                text: walletSeedViewModel.seed));
-                                            Scaffold.of(context).showSnackBar(
-                                              SnackBar(
-                                                content: Text(
-                                                    S.of(context).copied_to_clipboard),
-                                                backgroundColor: Colors.green,
-                                                duration: Duration(milliseconds: 1500),
-                                              ),
-                                            );
-                                          },
-                                          text: S.of(context).copy,
-                                          color: Theme.of(context).accentTextTheme.body2.color,
-                                          textColor: Colors.white)),
-                                ))
+                              padding: EdgeInsets.only(left: 8.0),
+                              child: Builder(
+                                  builder: (context) => PrimaryButton(
+                                      onPressed: () {
+                                        Clipboard.setData(ClipboardData(
+                                            text: walletSeedViewModel.seed));
+                                        Scaffold.of(context).showSnackBar(
+                                          SnackBar(
+                                            content: Text(S
+                                                .of(context)
+                                                .copied_to_clipboard),
+                                            backgroundColor: Colors.green,
+                                            duration:
+                                                Duration(milliseconds: 1500),
+                                          ),
+                                        );
+                                      },
+                                      text: S.of(context).copy,
+                                      color: Theme.of(context)
+                                          .accentTextTheme
+                                          .body2
+                                          .color,
+                                      textColor: Colors.white)),
+                            ))
                           ],
                         )
                       ],
diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart
index 187523de2..31bd2f703 100644
--- a/lib/src/screens/send/send_page.dart
+++ b/lib/src/screens/send/send_page.dart
@@ -16,7 +16,6 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/top_panel.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
-import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart';
 import 'package:cake_wallet/view_model/send/send_view_model_state.dart';
 import 'package:cake_wallet/src/widgets/trail_button.dart';
 
diff --git a/lib/src/screens/send/widgets/base_send_widget.dart b/lib/src/screens/send/widgets/base_send_widget.dart
index 871482a4c..82fd08635 100644
--- a/lib/src/screens/send/widgets/base_send_widget.dart
+++ b/lib/src/screens/send/widgets/base_send_widget.dart
@@ -1,5 +1,6 @@
 import 'dart:ui';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+// import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
@@ -18,7 +19,7 @@ import 'package:dotted_border/dotted_border.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart';
-import 'package:cake_wallet/src/screens/send/widgets/sending_alert.dart';
+// import 'package:cake_wallet/src/screens/send/widgets/sending_alert.dart';
 import 'package:cake_wallet/src/widgets/template_tile.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/routes.dart';
@@ -473,13 +474,13 @@ class BaseSendWidget extends StatelessWidget {
         return LoadingPrimaryButton(
             onPressed: () {
               if (_formKey.currentState.validate()) {
-                print('SENT!!!');
+
               }
             },
             text: S.of(context).send,
             color: Theme.of(context).accentTextTheme.body2.color,
             textColor: Colors.white,
-            isLoading: sendViewModel.state is TransactionIsCreating ||
+            isLoading: sendViewModel.state is IsExecutingState ||
                 sendViewModel.state is TransactionCommitting,
             isDisabled:
             false // FIXME !(syncStore.status is SyncedSyncStatus),
@@ -530,8 +531,8 @@ class BaseSendWidget extends StatelessWidget {
       }
     });
 
-    reaction((_) => sendViewModel.state, (SendViewModelState state) {
-      if (state is SendingFailed) {
+    reaction((_) => sendViewModel.state, (ExecutionState state) {
+      if (state is FailureState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           showDialog<void>(
               context: context,
@@ -545,7 +546,7 @@ class BaseSendWidget extends StatelessWidget {
         });
       }
 
-      if (state is TransactionCreatedSuccessfully) {
+      if (state is ExecutedSuccessfullyState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           showDialog<void>(
               context: context,
@@ -691,19 +692,19 @@ class BaseSendWidget extends StatelessWidget {
   }
 
   Future<void> _setTransactionPriority(BuildContext context) async {
-    final items = TransactionPriority.all;
-    final selectedItem = items.indexOf(sendViewModel.transactionPriority);
-
-    await showDialog<void>(
-        builder: (_) => Picker(
-          items: items,
-          selectedAtIndex: selectedItem,
-          title: S.of(context).please_select,
-          mainAxisAlignment: MainAxisAlignment.center,
-          onItemSelected: (TransactionPriority priority) => null,
-          // sendViewModel.setTransactionPriority(priority),
-          isAlwaysShowScrollThumb: true,
-        ),
-        context: context);
+    // final items = TransactionPriority.all;
+    // final selectedItem = items.indexOf(sendViewModel.transactionPriority);
+    //
+    // await showDialog<void>(
+    //     builder: (_) => Picker(
+    //       items: items,
+    //       selectedAtIndex: selectedItem,
+    //       title: S.of(context).please_select,
+    //       mainAxisAlignment: MainAxisAlignment.center,
+    //       onItemSelected: (TransactionPriority priority) => null,
+    //       // sendViewModel.setTransactionPriority(priority),
+    //       isAlwaysShowScrollThumb: true,
+    //     ),
+    //     context: context);
   }
 }
\ No newline at end of file
diff --git a/lib/src/screens/send/widgets/sending_alert.dart b/lib/src/screens/send/widgets/sending_alert.dart
deleted file mode 100644
index 08848fb6f..000000000
--- a/lib/src/screens/send/widgets/sending_alert.dart
+++ /dev/null
@@ -1,104 +0,0 @@
-import 'dart:ui';
-import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/stores/send/sending_state.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/stores/send/send_store.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-
-class SendingAlert extends StatefulWidget {
-  SendingAlert({@required this.sendStore});
-
-  final SendStore sendStore;
-
-  @override
-  SendingAlertState createState() => SendingAlertState(sendStore);
-}
-
-class SendingAlertState extends State<SendingAlert> {
-  SendingAlertState(this.sendStore);
-
-  final SendStore sendStore;
-
-  @override
-  Widget build(BuildContext context) {
-    return Observer(
-      builder: (_) {
-        final state = sendStore.state;
-
-        if (state is TransactionCommitted) {
-          return Stack(
-            children: <Widget>[
-              Container(
-                color: Theme.of(context).backgroundColor,
-                  child: Center(
-                    child: Image.asset(
-                        'assets/images/birthday_cake.png'),
-                  ),
-              ),
-              Center(
-                child: Padding(
-                  padding: EdgeInsets.only(top: 220, left: 24, right: 24),
-                  child: Text(
-                    S.of(context).send_success,
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                      fontSize: 22,
-                      fontWeight: FontWeight.bold,
-                      color: Theme.of(context).primaryTextTheme.title.color,
-                      decoration: TextDecoration.none,
-                    ),
-                  ),
-                ),
-              ),
-              Positioned(
-                left: 24,
-                right: 24,
-                bottom: 24,
-                child: PrimaryButton(
-                  onPressed: () => Navigator.of(context).pop(),
-                  text: S.of(context).send_got_it,
-                  color: Colors.blue,
-                  textColor: Colors.white
-                )
-              )
-            ],
-          );
-        }
-
-        return Stack(
-          children: <Widget>[
-            Container(
-              color: Theme.of(context).backgroundColor,
-              child: Center(
-                child: Image.asset(
-                    'assets/images/birthday_cake.png'),
-              ),
-            ),
-            BackdropFilter(
-              filter: ImageFilter.blur(sigmaX: 3.0, sigmaY: 3.0),
-              child: Container(
-                decoration: BoxDecoration(color: Theme.of(context).backgroundColor.withOpacity(0.25)),
-                child: Center(
-                  child: Padding(
-                    padding: EdgeInsets.only(top: 220),
-                    child: Text(
-                      S.of(context).send_sending,
-                      textAlign: TextAlign.center,
-                      style: TextStyle(
-                        fontSize: 22,
-                        fontWeight: FontWeight.bold,
-                        color: Theme.of(context).primaryTextTheme.title.color,
-                        decoration: TextDecoration.none,
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            )
-          ],
-        );
-      }
-    );
-  }
-}
\ No newline at end of file
diff --git a/lib/src/screens/settings/change_language.dart b/lib/src/screens/settings/change_language.dart
index 9e207390b..78e6f09fb 100644
--- a/lib/src/screens/settings/change_language.dart
+++ b/lib/src/screens/settings/change_language.dart
@@ -4,61 +4,65 @@ import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:provider/provider.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/language.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
+import 'package:cake_wallet/entities/language.dart';
+// import 'package:cake_wallet/src/stores/settings/settings_store.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 
+// FIXME: FIXME
+
 class ChangeLanguage extends BasePage {
   @override
   String get title => S.current.settings_change_language;
 
   @override
   Widget body(BuildContext context) {
-    final settingsStore = Provider.of<SettingsStore>(context);
-    final currentLanguage = Provider.of<Language>(context);
+    // final settingsStore = Provider.of<SettingsStore>(context);
+    // final currentLanguage = Provider.of<Language>(context);
+    //
+    // return Container(
+    //     padding: EdgeInsets.only(top: 10.0),
+    //     child: SectionStandardList(
+    //       sectionCount: 1,
+    //       context: context,
+    //       itemCounter: (int sectionIndex) => languages.values.length,
+    //       itemBuilder: (_, sectionIndex, index) {
+    //         final item = languages.values.elementAt(index);
+    //         final code = languages.keys.elementAt(index);
+    //
+    //         final isCurrent = settingsStore.languageCode == null
+    //             ? false
+    //             : code == settingsStore.languageCode;
+    //
+    //         return LanguageRow(
+    //           title: item,
+    //           isSelected: isCurrent,
+    //           handler: (context) async {
+    //             if (!isCurrent) {
+    //               await showDialog<void>(
+    //                   context: context,
+    //                   builder: (BuildContext context) {
+    //                     return AlertWithTwoActions(
+    //                         alertTitle: S.of(context).change_language,
+    //                         alertContent: S.of(context).change_language_to(item),
+    //                         rightButtonText: S.of(context).change,
+    //                         leftButtonText: S.of(context).cancel,
+    //                         actionRightButton: () {
+    //                           settingsStore.saveLanguageCode(
+    //                               languageCode: code);
+    //                           currentLanguage.setCurrentLanguage(code);
+    //                           Navigator.of(context).pop();
+    //                         },
+    //                         actionLeftButton: () => Navigator.of(context).pop()
+    //                     );
+    //                   });
+    //             }
+    //           },
+    //         );
+    //       },
+    //     )
+    // );
 
-    return Container(
-        padding: EdgeInsets.only(top: 10.0),
-        child: SectionStandardList(
-          sectionCount: 1,
-          context: context,
-          itemCounter: (int sectionIndex) => languages.values.length,
-          itemBuilder: (_, sectionIndex, index) {
-            final item = languages.values.elementAt(index);
-            final code = languages.keys.elementAt(index);
-
-            final isCurrent = settingsStore.languageCode == null
-                ? false
-                : code == settingsStore.languageCode;
-
-            return LanguageRow(
-              title: item,
-              isSelected: isCurrent,
-              handler: (context) async {
-                if (!isCurrent) {
-                  await showDialog<void>(
-                      context: context,
-                      builder: (BuildContext context) {
-                        return AlertWithTwoActions(
-                            alertTitle: S.of(context).change_language,
-                            alertContent: S.of(context).change_language_to(item),
-                            rightButtonText: S.of(context).change,
-                            leftButtonText: S.of(context).cancel,
-                            actionRightButton: () {
-                              settingsStore.saveLanguageCode(
-                                  languageCode: code);
-                              currentLanguage.setCurrentLanguage(code);
-                              Navigator.of(context).pop();
-                            },
-                            actionLeftButton: () => Navigator.of(context).pop()
-                        );
-                      });
-                }
-              },
-            );
-          },
-        )
-    );
+    return null;
   }
 }
diff --git a/lib/src/screens/setup_pin_code/setup_pin_code.dart b/lib/src/screens/setup_pin_code/setup_pin_code.dart
index 628337e30..dad0c0f2f 100644
--- a/lib/src/screens/setup_pin_code/setup_pin_code.dart
+++ b/lib/src/screens/setup_pin_code/setup_pin_code.dart
@@ -1,105 +1,81 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:provider/provider.dart';
-import 'package:cake_wallet/src/stores/user/user_store.dart';
-import 'package:cake_wallet/src/screens/pin_code/pin_code.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
+import 'package:cake_wallet/view_model/setup_pin_code_view_model.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 
 class SetupPinCodePage extends BasePage {
-  SetupPinCodePage({this.onPinCodeSetup});
+  SetupPinCodePage(this.pinCodeViewModel, {this.onSuccessfulPinSetup});
 
-  final Function(BuildContext, String) onPinCodeSetup;
+  final SetupPinCodeViewModel pinCodeViewModel;
+  final void Function(BuildContext, String) onSuccessfulPinSetup;
 
   @override
   String get title => S.current.setup_pin;
 
   @override
-  Widget body(BuildContext context) =>
-      SetupPinCodeForm(onPinCodeSetup: onPinCodeSetup, hasLengthSwitcher: true);
-}
+  Widget body(BuildContext context) => PinCodeWidget(
+      hasLengthSwitcher: true,
+      onFullPin: (String pin, PinCodeState<PinCodeWidget> state) async {
+        if (pinCodeViewModel.isOriginalPinCodeFull && !pinCodeViewModel.isRepeatedPinCodeFull) {
+          state.title = S.current.enter_your_pin_again;
+          state.clear();
+          return;
+        }
 
-class SetupPinCodeForm extends PinCodeWidget {
-  SetupPinCodeForm(
-      {@required this.onPinCodeSetup, @required bool hasLengthSwitcher})
-      : super(hasLengthSwitcher: hasLengthSwitcher);
+        if (!pinCodeViewModel.isPinCodeCorrect) {
+          await showDialog<void>(
+              context: context,
+              builder: (BuildContext context) {
+                return AlertWithOneAction(
+                    alertTitle: S.current.setup_pin,
+                    alertContent: S.of(context).pin_is_incorrect,
+                    buttonText: S.of(context).ok,
+                    buttonAction: () => Navigator.of(context).pop());
+              });
+          pinCodeViewModel.reset();
+          state.reset();
+          return;
+        }
 
-  final Function(BuildContext, String) onPinCodeSetup;
+        try {
+          await pinCodeViewModel.setupPinCode();
 
-  @override
-  _SetupPinCodeFormState createState() => _SetupPinCodeFormState();
-}
-
-class _SetupPinCodeFormState<WidgetType extends SetupPinCodeForm>
-    extends PinCodeState<WidgetType> {
-  _SetupPinCodeFormState() {
-    title = S.current.enter_your_pin;
-  }
-
-  bool isEnteredOriginalPin() => _originalPin.isNotEmpty;
-  Function(BuildContext) onPinCodeSetup;
-  List<int> _originalPin = [];
-  UserStore _userStore;
-  SettingsStore _settingsStore;
-
-  @override
-  void onPinCodeEntered(PinCodeState state) {
-    if (!isEnteredOriginalPin()) {
-      _originalPin = state.pin;
-      state.title = S.current.enter_your_pin_again;
-      state.clear();
-    } else {
-      if (listEquals<int>(state.pin, _originalPin)) {
-        final String pin = state.pin.fold('', (ac, val) => ac + '$val');
-        _userStore.set(password: pin);
-        _settingsStore.setDefaultPinLength(pinLength: state.pinLength);
-
-        showDialog<void>(
-            context: context,
-            builder: (BuildContext context) {
-              return AlertWithOneAction(
+          await showDialog<void>(
+              context: context,
+              builder: (BuildContext context) {
+                return AlertWithOneAction(
                   alertTitle: S.current.setup_pin,
                   alertContent: S.of(context).setup_successful,
                   buttonText: S.of(context).ok,
                   buttonAction: () {
                     Navigator.of(context).pop();
-                    widget.onPinCodeSetup(context, pin);
-                    reset();
+                    onSuccessfulPinSetup(context, pin);
+                    state.reset();
                   },
                   alertBarrierDismissible: false,
-              );
-            });
-      } else {
-        showDialog<void>(
-            context: context,
-            builder: (BuildContext context) {
-              return AlertWithOneAction(
+                );
+              });
+        } catch (e) {
+          // FIXME: Add translation for alert content text.
+          await showDialog<void>(
+              context: context,
+              builder: (BuildContext context) {
+                return AlertWithOneAction(
                   alertTitle: S.current.setup_pin,
-                  alertContent: S.of(context).pin_is_incorrect,
+                  alertContent:
+                      'Setup pin is failed with error: ${e.toString()}',
                   buttonText: S.of(context).ok,
-                  buttonAction: () => Navigator.of(context).pop()
-              );
-            });
-
-        reset();
-      }
-    }
-  }
-
-  void reset() {
-    clear();
-    setTitle(S.current.enter_your_pin);
-    _originalPin = [];
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    _userStore = Provider.of<UserStore>(context);
-    _settingsStore = Provider.of<SettingsStore>(context);
-
-    return body(context);
-  }
+                  buttonAction: () => Navigator.of(context).pop(),
+                  alertBarrierDismissible: false,
+                );
+              });
+        }
+      },
+      onChangedPin: (String pin) => pinCodeViewModel.pinCode = pin,
+      onChangedPinLength: (int length) =>
+          pinCodeViewModel.pinCodeLength = length,
+      initialPinLength: pinCodeViewModel.pinCodeLength);
 }
diff --git a/lib/src/screens/subaddress/subaddress_list_page.dart b/lib/src/screens/subaddress/subaddress_list_page.dart
deleted file mode 100644
index 0327aa933..000000000
--- a/lib/src/screens/subaddress/subaddress_list_page.dart
+++ /dev/null
@@ -1,67 +0,0 @@
-import 'package:provider/provider.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/stores/subaddress_list/subaddress_list_store.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-
-class SubaddressListPage extends BasePage {
-  SubaddressListPage();
-
-  @override
-  bool get isModalBackButton => true;
-
-  @override
-  String get title => S.current.subaddress_title;
-
-  @override
-  AppBarStyle get appBarStyle => AppBarStyle.withShadow;
-
-  @override
-  Widget body(BuildContext context) {
-    final walletStore = Provider.of<WalletStore>(context);
-    final subaddressListStore = Provider.of<SubaddressListStore>(context);
-
-    final currentColor = Theme.of(context).selectedRowColor;
-    final notCurrentColor = Theme.of(context).backgroundColor;
-
-    return Container(
-        padding: EdgeInsets.only(top: 20.0, bottom: 20.0),
-        child: Observer(
-          builder: (_) => ListView.separated(
-              separatorBuilder: (_, __) => Divider(
-                  color: Theme.of(context).dividerTheme.color, height: 1.0),
-              itemCount: subaddressListStore.subaddresses == null
-                  ? 0
-                  : subaddressListStore.subaddresses.length,
-              itemBuilder: (BuildContext context, int index) {
-                final subaddress = subaddressListStore.subaddresses[index];
-                final isCurrent =
-                    walletStore.subaddress.address == subaddress.address;
-                final label = subaddress.label ?? subaddress.address;
-
-                return InkWell(
-                  onTap: () => Navigator.of(context).pop(subaddress),
-                  child: Container(
-                    color: isCurrent ? currentColor : notCurrentColor,
-                    child: Column(children: <Widget>[
-                      ListTile(
-                        title: Text(
-                          label,
-                          style: TextStyle(
-                              fontSize: 16.0,
-                              color: Theme.of(context)
-                                  .primaryTextTheme
-                                  .headline
-                                  .color),
-                        ),
-                      )
-                    ]),
-                  ),
-                );
-              }),
-        ));
-  }
-}
diff --git a/lib/src/screens/trade_details/trade_details_page.dart b/lib/src/screens/trade_details/trade_details_page.dart
index 52b85b873..da71e80ac 100644
--- a/lib/src/screens/trade_details/trade_details_page.dart
+++ b/lib/src/screens/trade_details/trade_details_page.dart
@@ -1,92 +1,88 @@
-import 'package:provider/provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/stores/exchange_trade/exchange_trade_store.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
+import 'package:cake_wallet/utils/date_formatter.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
 import 'package:cake_wallet/src/widgets/standart_list_row.dart';
 
 class TradeDetailsPage extends BasePage {
+  TradeDetailsPage(this.trade) : _items = [] {
+    final dateFormat = DateFormatter.withCurrentLocal();
+    final items = [
+      StandartListItem(title: S.current.trade_details_id, value: trade.id),
+      StandartListItem(
+          title: S.current.trade_details_state,
+          value: trade.state != null
+              ? trade.state.toString()
+              : S.current.trade_details_fetching)
+    ];
+
+    if (trade.provider != null) {
+      items.add(StandartListItem(
+          title: S.current.trade_details_provider,
+          value: trade.provider.toString()));
+    }
+
+    if (trade.createdAt != null) {
+      items.add(StandartListItem(
+          title: S.current.trade_details_created_at,
+          value: dateFormat.format(trade.createdAt).toString()));
+    }
+
+    if (trade.from != null && trade.to != null) {
+      items.add(StandartListItem(
+          title: S.current.trade_details_pair,
+          value: '${trade.from.toString()} → ${trade.to.toString()}'));
+    }
+  }
 
   @override
   String get title => S.current.trade_details_title;
 
+  final Trade trade;
+  final List<StandartListItem> _items;
+
   @override
   Widget body(BuildContext context) {
-    final exchangeStore = Provider.of<ExchangeTradeStore>(context);
-    final settingsStore = Provider.of<SettingsStore>(context);
-    final createdAtFormat = settingsStore.getCurrentDateFormat(
-          formatUSA: "yyyy.MM.dd, HH:mm",
-          formatDefault: "dd.MM.yyyy, HH:mm");
-
-    return Container(
-        child: Observer(builder: (_) {
-          final trade = exchangeStore.trade;
-          final items = [
-            StandartListItem(
-                title: S.of(context).trade_details_id, value: trade.id),
-            StandartListItem(
-                title: S.of(context).trade_details_state,
-                value: trade.state != null
-                    ? trade.state.toString()
-                    : S.of(context).trade_details_fetching)
-          ];
-
-          if (trade.provider != null) {
-            items.add(StandartListItem(
-                title: S.of(context).trade_details_provider,
-                value: trade.provider.toString()));
-          }
-
-          if (trade.createdAt != null) {
-            items.add(StandartListItem(
-                title: S.of(context).trade_details_created_at,
-                value: createdAtFormat.format(trade.createdAt).toString()));
-          }
-
-          if (trade.from != null && trade.to != null) {
-            items.add(StandartListItem(
-                title: S.of(context).trade_details_pair,
-                value: '${trade.from.toString()} → ${trade.to.toString()}'));
-          }
-
-          return ListView.separated(
-              separatorBuilder: (_, __) => Container(
-                height: 1,
-                padding: EdgeInsets.only(left: 24),
-                color: Theme.of(context).backgroundColor,
-                child: Container(
+    return Container(child: Observer(builder: (_) {
+      return ListView.separated(
+          separatorBuilder: (_, __) => Container(
+              height: 1,
+              padding: EdgeInsets.only(left: 24),
+              color: Theme.of(context).backgroundColor,
+              child: Container(
                   height: 1,
-                  color: Theme.of(context).primaryTextTheme.title.backgroundColor,
-                ),
-              ),
-              itemCount: items.length,
-              itemBuilder: (BuildContext context, int index) {
-                final item = items[index];
-                final isDrawBottom = index == items.length - 1 ? true : false;
+                  color: Theme.of(context)
+                      .primaryTextTheme
+                      .title
+                      .backgroundColor)),
+          itemCount: _items.length,
+          itemBuilder: (BuildContext context, int index) {
+            final item = _items[index];
+            final isDrawBottom = index == _items.length - 1 ? true : false;
 
-                return GestureDetector(
-                    onTap: () {
-                      Clipboard.setData(ClipboardData(text: '${item.value}'));
-                      Scaffold.of(context).showSnackBar(
-                        SnackBar(
-                          content: Text(
-                              S.of(context).trade_details_copied(item.title)),
-                          backgroundColor: Colors.green,
-                          duration: Duration(milliseconds: 1500),
-                        ),
-                      );
-                    },
-                    child: StandartListRow(
-                      title: '${item.title}',
-                      value: '${item.value}',
-                      isDrawBottom: isDrawBottom,
-                    ));
-              });
-        }));
+            return GestureDetector(
+                onTap: () {
+                  Clipboard.setData(ClipboardData(text: '${item.value}'));
+                  Scaffold.of(context).showSnackBar(
+                    SnackBar(
+                      content:
+                          Text(S.of(context).trade_details_copied(item.title)),
+                      backgroundColor: Colors.green,
+                      duration: Duration(milliseconds: 1500),
+                    ),
+                  );
+                },
+                child: StandartListRow(
+                  title: '${item.title}',
+                  value: '${item.value}',
+                  isDrawBottom: isDrawBottom,
+                ));
+          });
+    }));
   }
 }
diff --git a/lib/src/screens/transaction_details/transaction_details_page.dart b/lib/src/screens/transaction_details/transaction_details_page.dart
index bb2a80e33..635946b4e 100644
--- a/lib/src/screens/transaction_details/transaction_details_page.dart
+++ b/lib/src/screens/transaction_details/transaction_details_page.dart
@@ -1,21 +1,17 @@
-
-import 'package:intl/intl.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart';
-import 'package:cake_wallet/src/domain/monero/monero_transaction_info.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
+import 'package:cake_wallet/monero/monero_transaction_info.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
 import 'package:cake_wallet/src/widgets/standart_list_row.dart';
 import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/utils/date_formatter.dart';
 
 class TransactionDetailsPage extends BasePage {
-  TransactionDetailsPage({this.transactionInfo}) : _items = [] {
-    // FIXME
-//    final _dateFormat = widget.settingsStore.getCurrentDateFormat(
-//        formatUSA: "yyyy.MM.dd, HH:mm", formatDefault: "dd.MM.yyyy, HH:mm");
-    final dateFormat = DateFormat('dd.MM.yyyy, HH:mm');
+  TransactionDetailsPage(this.transactionInfo) : _items = [] {
+    final dateFormat = DateFormatter.withCurrentLocal();
     final tx = transactionInfo;
 
     if (tx is MoneroTransactionInfo) {
@@ -50,8 +46,7 @@ class TransactionDetailsPage extends BasePage {
             title: S.current.transaction_details_date,
             value: dateFormat.format(tx.date)),
         StandartListItem(
-            title: 'Confirmations',
-            value: tx.confirmations?.toString()),
+            title: 'Confirmations', value: tx.confirmations?.toString()),
         StandartListItem(
             title: S.current.transaction_details_height, value: '${tx.height}'),
         StandartListItem(
@@ -80,7 +75,8 @@ class TransactionDetailsPage extends BasePage {
                 color: Theme.of(context).backgroundColor,
                 child: Container(
                   height: 1,
-                  color: Theme.of(context).primaryTextTheme.title.backgroundColor,
+                  color:
+                      Theme.of(context).primaryTextTheme.title.backgroundColor,
                 ),
               ),
           itemCount: _items.length,
diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart
index 025db9eca..0e743e1c9 100644
--- a/lib/src/screens/wallet_list/wallet_list_page.dart
+++ b/lib/src/screens/wallet_list/wallet_list_page.dart
@@ -4,7 +4,7 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
diff --git a/lib/src/screens/wallet_list/wallet_menu.dart b/lib/src/screens/wallet_list/wallet_menu.dart
index e6f0fa47e..a508541bd 100644
--- a/lib/src/screens/wallet_list/wallet_menu.dart
+++ b/lib/src/screens/wallet_list/wallet_menu.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:provider/provider.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/stores/wallet_list/wallet_list_store.dart';
+// import 'package:cake_wallet/src/stores/wallet_list/wallet_list_store.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 import 'package:cake_wallet/palette.dart';
diff --git a/lib/src/start_updating_price.dart b/lib/src/start_updating_price.dart
deleted file mode 100644
index 82a6771b1..000000000
--- a/lib/src/start_updating_price.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'dart:async';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/fetch_price.dart';
-import 'package:cake_wallet/src/stores/price/price_store.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-
-bool _startedUpdatingPrice = false;
-
-Future<double> _updatePrice(Map args) async => await fetchPriceFor(
-    fiat: args['fiat'] as FiatCurrency,
-    crypto: args['crypto'] as CryptoCurrency);
-
-Future<double> updatePrice(Map args) async => compute(_updatePrice, args);
-
-Future<void> startUpdatingPrice(
-    {SettingsStore settingsStore, PriceStore priceStore}) async {
-  if (_startedUpdatingPrice) {
-    return;
-  }
-
-  const currentCrypto = CryptoCurrency.xmr;
-  _startedUpdatingPrice = true;
-
-  final price = await updatePrice(
-      <String, dynamic>{'fiat': settingsStore.fiatCurrency, 'crypto': currentCrypto});
-  priceStore.changePriceForPair(
-      fiat: settingsStore.fiatCurrency, crypto: currentCrypto, price: price);
-
-  Timer.periodic(Duration(seconds: 30), (_) async {
-    final price = await updatePrice(
-        <String, dynamic>{'fiat': settingsStore.fiatCurrency, 'crypto': currentCrypto});
-    priceStore.changePriceForPair(
-        fiat: settingsStore.fiatCurrency, crypto: currentCrypto, price: price);
-  });
-}
diff --git a/lib/src/stores/account_list/account_list_store.dart b/lib/src/stores/account_list/account_list_store.dart
deleted file mode 100644
index 0b8f2f81f..000000000
--- a/lib/src/stores/account_list/account_list_store.dart
+++ /dev/null
@@ -1,108 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
-import 'package:cake_wallet/src/domain/monero/account_list.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-
-part 'account_list_store.g.dart';
-
-class AccountListStore = AcountListStoreBase with _$AccountListStore;
-
-abstract class AcountListStoreBase with Store {
-  AcountListStoreBase({@required WalletService walletService}) {
-    accounts = [];
-    isAccountCreating = false;
-    isDisabledStatus = true;
-
-    if (walletService.currentWallet != null) {
-      _onWalletChanged(walletService.currentWallet);
-    }
-
-    _onWalletChangeSubscription =
-        walletService.onWalletChange.listen(_onWalletChanged);
-  }
-
-  @observable
-  List<Account> accounts;
-
-  @observable
-  bool isValid;
-
-  @observable
-  String errorMessage;
-
-  @observable
-  bool isAccountCreating;
-
-  @observable
-  bool isDisabledStatus;
-
-  AccountList _accountList;
-  StreamSubscription<Wallet> _onWalletChangeSubscription;
-  StreamSubscription<List<Account>> _onAccountsChangeSubscription;
-
-  @action
-  void setDisabledStatus(bool isDisabled) {
-    isDisabledStatus = isDisabled;
-  }
-
-  // @override
-  // void dispose() {
-  //   _onWalletChangeSubscription.cancel();
-
-  //   if (_onAccountsChangeSubscription != null) {
-  //     _onAccountsChangeSubscription.cancel();
-  //   }
-
-  //   super.dispose();
-  // }
-
-  void updateAccountList() {
-    _accountList.refresh();
-    accounts = _accountList.getAll();
-  }
-
-  Future addAccount({String label}) async {
-    try {
-      isAccountCreating = true;
-      await _accountList.addAccount(label: label);
-      updateAccountList();
-      isAccountCreating = false;
-    } catch (e) {
-      isAccountCreating = false;
-    }
-  }
-
-  Future renameAccount({int index, String label}) async {
-    await _accountList.setLabelSubaddress(accountIndex: index, label: label);
-    updateAccountList();
-  }
-
-  Future _onWalletChanged(Wallet wallet) async {
-    if (_onAccountsChangeSubscription != null) {
-      await _onAccountsChangeSubscription.cancel();
-    }
-
-    if (wallet is MoneroWallet) {
-      _accountList = wallet.getAccountList();
-      _onAccountsChangeSubscription =
-          _accountList.accounts.listen((accounts) => this.accounts = accounts);
-      updateAccountList();
-
-      return;
-    }
-
-    print('Incorrect wallet type for this operation (AccountList)');
-  }
-
-  void validateAccountName(String value) {
-    const pattern = '^[a-zA-Z0-9_]{1,15}\$';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    errorMessage = isValid ? null : S.current.error_text_account_name;
-  }
-}
diff --git a/lib/src/stores/action_list/action_list_item.dart b/lib/src/stores/action_list/action_list_item.dart
deleted file mode 100644
index b03bd1bdc..000000000
--- a/lib/src/stores/action_list/action_list_item.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-abstract class ActionListItem {
-  DateTime get date;
-}
\ No newline at end of file
diff --git a/lib/src/stores/action_list/action_list_store.dart b/lib/src/stores/action_list/action_list_store.dart
deleted file mode 100644
index e31296575..000000000
--- a/lib/src/stores/action_list/action_list_store.dart
+++ /dev/null
@@ -1,239 +0,0 @@
-import 'dart:async';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/monero/monero_transaction_info.dart';
-import 'package:hive/hive.dart';
-import 'package:mobx/mobx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
-import 'package:cake_wallet/src/domain/common/transaction_history.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/domain/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/common/calculate_fiat_amount_raw.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/monero/monero_amount_format.dart';
-import 'package:cake_wallet/src/domain/monero/transaction_description.dart';
-import 'package:cake_wallet/src/stores/price/price_store.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/src/stores/action_list/action_list_display_mode.dart';
-import 'package:cake_wallet/src/stores/action_list/action_list_item.dart';
-import 'package:cake_wallet/src/stores/action_list/date_section_item.dart';
-import 'package:cake_wallet/src/stores/action_list/trade_filter_store.dart';
-import 'package:cake_wallet/src/stores/action_list/trade_list_item.dart';
-import 'package:cake_wallet/src/stores/action_list/transaction_filter_store.dart';
-import 'package:cake_wallet/src/stores/action_list/transaction_list_item.dart';
-
-part 'action_list_store.g.dart';
-
-class ActionListStore = ActionListBase with _$ActionListStore;
-
-abstract class ActionListBase with Store {
-  ActionListBase(
-      {@required WalletService walletService,
-      @required SettingsStore settingsStore,
-      @required PriceStore priceStore,
-      @required this.transactionFilterStore,
-      @required this.tradeFilterStore,
-      @required this.transactionDescriptions,
-      @required this.tradesSource}) {
-    trades = List<TradeListItem>();
-    _transactions = List<TransactionListItem>();
-    _walletService = walletService;
-    _settingsStore = settingsStore;
-    _priceStore = priceStore;
-
-    if (walletService.currentWallet != null) {
-      _onWalletChanged(walletService.currentWallet);
-    }
-
-    _onWalletChangeSubscription =
-        walletService.onWalletChange.listen(_onWalletChanged);
-
-    _onTransactionDescriptions = transactionDescriptions
-        .watch()
-        .listen((_) async => await _updateTransactionsList());
-
-    _onTradesChanged =
-        tradesSource.watch().listen((_) async => await updateTradeList());
-
-    updateTradeList();
-  }
-
-  static List<ActionListItem> formattedItemsList(List<ActionListItem> items) {
-    final formattedList = List<ActionListItem>();
-    DateTime lastDate;
-    items.sort((a, b) => b.date.compareTo(a.date));
-
-    for (int i = 0; i < items.length; i++) {
-      final transaction = items[i];
-
-      if (lastDate == null) {
-        lastDate = transaction.date;
-        formattedList.add(DateSectionItem(transaction.date));
-        formattedList.add(transaction);
-        continue;
-      }
-
-      final isCurrentDay = lastDate.year == transaction.date.year &&
-          lastDate.month == transaction.date.month &&
-          lastDate.day == transaction.date.day;
-
-      if (isCurrentDay) {
-        formattedList.add(transaction);
-        continue;
-      }
-
-      lastDate = transaction.date;
-      formattedList.add(DateSectionItem(transaction.date));
-      formattedList.add(transaction);
-    }
-
-    return formattedList;
-  }
-
-  @computed
-  List<TransactionListItem> get transactions {
-    final symbol = PriceStoreBase.generateSymbolForPair(
-        fiat: _settingsStore.fiatCurrency, crypto: CryptoCurrency.xmr);
-    final price = _priceStore.prices[symbol];
-
-    _transactions.forEach((item) {
-      final tx = item.transaction;
-
-      if (tx is MoneroTransactionInfo) {
-        final amount = calculateFiatAmountRaw(
-            cryptoAmount: moneroAmountToDouble(amount: tx.amount),
-            price: price);
-        tx.changeFiatAmount(amount);
-      }
-    });
-
-    return _transactions;
-  }
-
-  @observable
-  List<TransactionListItem> _transactions;
-
-  @observable
-  List<TradeListItem> trades;
-
-  @computed
-  List<ActionListItem> get items {
-    final _items = List<ActionListItem>();
-
-    if (_settingsStore.actionlistDisplayMode
-        .contains(ActionListDisplayMode.transactions)) {
-      _items
-          .addAll(transactionFilterStore.filtered(transactions: transactions));
-    }
-
-    if (_settingsStore.actionlistDisplayMode
-        .contains(ActionListDisplayMode.trades)) {
-      _items.addAll(tradeFilterStore.filtered(trades: trades));
-    }
-
-    return formattedItemsList(_items);
-  }
-
-  @computed
-  int get totalCount => transactions.length + trades.length;
-
-  TransactionFilterStore transactionFilterStore;
-  TradeFilterStore tradeFilterStore;
-  Box<TransactionDescription> transactionDescriptions;
-  Box<Trade> tradesSource;
-
-  WalletService _walletService;
-  TransactionHistory _history;
-  SettingsStore _settingsStore;
-  PriceStore _priceStore;
-  Account _account;
-  StreamSubscription<Wallet> _onWalletChangeSubscription;
-  StreamSubscription<List<TransactionInfo>> _onTransactionsChangeSubscription;
-  StreamSubscription<Account> _onAccountChangeSubscription;
-  StreamSubscription<BoxEvent> _onTransactionDescriptions;
-  StreamSubscription<BoxEvent> _onTradesChanged;
-
-  // @override
-  // void dispose() {
-  //   if (_onTransactionsChangeSubscription != null) {
-  //     _onTransactionsChangeSubscription.cancel();
-  //   }
-
-  //   if (_onAccountChangeSubscription != null) {
-  //     _onAccountChangeSubscription.cancel();
-  //   }
-
-  //   _onTransactionDescriptions?.cancel();
-  //   _onWalletChangeSubscription.cancel();
-  //   _onTradesChanged?.cancel();
-  //   super.dispose();
-  // }
-
-  @action
-  Future updateTradeList() async => this.trades =
-      tradesSource.values.map((trade) => TradeListItem(trade: trade)).toList();
-
-  Future _updateTransactionsList() async {
-    final _transactions = await _history.getAll();
-    await _setTransactions(_transactions);
-  }
-
-  Future _onWalletChanged(Wallet wallet) async {
-    if (_onTransactionsChangeSubscription != null) {
-      await _onTransactionsChangeSubscription.cancel();
-    }
-
-    if (_onAccountChangeSubscription != null) {
-      await _onAccountChangeSubscription.cancel();
-    }
-
-    _history = wallet.getHistory();
-    _onTransactionsChangeSubscription = _history.transactions
-        .listen((transactions) => _setTransactions(transactions));
-
-    if (wallet is MoneroWallet) {
-      _account = wallet.account;
-      _onAccountChangeSubscription = wallet.onAccountChange.listen((account) {
-        _account = account;
-        _updateTransactionsList();
-      });
-    }
-
-    await _updateTransactionsList();
-  }
-
-  Future _setTransactions(List<TransactionInfo> transactions) async {
-    final wallet = _walletService.currentWallet;
-    List<TransactionInfo> sortedTransactions = transactions.map((transaction) {
-      if (transaction is MoneroTransactionInfo) {
-        if (transactionDescriptions.values.isNotEmpty) {
-          final description = transactionDescriptions.values.firstWhere(
-              (desc) => desc.id == transaction.id,
-              orElse: () => null);
-
-          if (description != null && description.recipientAddress != null) {
-            transaction.recipientAddress = description.recipientAddress;
-          }
-        }
-
-        return transaction;
-      }
-
-      return transaction;
-    }).toList();
-
-    if (wallet is MoneroWallet) {
-      sortedTransactions = transactions
-          .where((tx) => tx is MoneroTransactionInfo
-              ? tx.accountIndex == _account.id
-              : false)
-          .toList();
-    }
-
-    this._transactions = sortedTransactions
-        .map((transaction) => TransactionListItem(transaction: transaction))
-        .toList();
-  }
-}
diff --git a/lib/src/stores/action_list/date_section_item.dart b/lib/src/stores/action_list/date_section_item.dart
deleted file mode 100644
index 5a4b217ad..000000000
--- a/lib/src/stores/action_list/date_section_item.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-import 'package:cake_wallet/src/stores/action_list/action_list_item.dart';
-
-class DateSectionItem extends ActionListItem {
-  DateSectionItem(this.date);
-  
-  @override
-  final DateTime date;
-}
\ No newline at end of file
diff --git a/lib/src/stores/action_list/trade_filter_store.dart b/lib/src/stores/action_list/trade_filter_store.dart
deleted file mode 100644
index 4577038e3..000000000
--- a/lib/src/stores/action_list/trade_filter_store.dart
+++ /dev/null
@@ -1,62 +0,0 @@
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/src/stores/action_list/trade_list_item.dart';
-
-part 'trade_filter_store.g.dart';
-
-class TradeFilterStore = TradeFilterStoreBase with _$TradeFilterStore;
-
-abstract class TradeFilterStoreBase with Store {
-  TradeFilterStoreBase(
-      {this.displayXMRTO = true,
-      this.displayChangeNow = true,
-      this.displayMorphToken = true,
-      this.walletStore});
-
-  @observable
-  bool displayXMRTO;
-
-  @observable
-  bool displayChangeNow;
-
-  @observable
-  bool displayMorphToken;
-
-  WalletStore walletStore;
-
-  @action
-  void toggleDisplayExchange(ExchangeProviderDescription provider) {
-    switch (provider) {
-      case ExchangeProviderDescription.changeNow:
-        displayChangeNow = !displayChangeNow;
-        break;
-      case ExchangeProviderDescription.xmrto:
-        displayXMRTO = !displayXMRTO;
-        break;
-      case ExchangeProviderDescription.morphToken:
-        displayMorphToken = !displayMorphToken;
-        break;
-    }
-  }
-
-  List<TradeListItem> filtered({List<TradeListItem> trades}) {
-    final _trades =
-        trades.where((item) => item.trade.walletId == walletStore.id).toList();
-    final needToFilter = !displayChangeNow || !displayXMRTO || !displayMorphToken;
-
-    return needToFilter
-        ? trades
-            .where((item) =>
-                (displayXMRTO &&
-                    item.trade.provider == ExchangeProviderDescription.xmrto) ||
-                (displayChangeNow &&
-                    item.trade.provider ==
-                        ExchangeProviderDescription.changeNow) ||
-                (displayMorphToken &&
-                    item.trade.provider ==
-                        ExchangeProviderDescription.morphToken))
-            .toList()
-        : _trades;
-  }
-}
diff --git a/lib/src/stores/action_list/trade_list_item.dart b/lib/src/stores/action_list/trade_list_item.dart
deleted file mode 100644
index 1c13a1bc1..000000000
--- a/lib/src/stores/action_list/trade_list_item.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/stores/action_list/action_list_item.dart';
-
-class TradeListItem extends ActionListItem {
-  TradeListItem({this.trade});
-
-  final Trade trade;
-
-  @override
-  DateTime get date => trade.createdAt;
-}
diff --git a/lib/src/stores/action_list/transaction_filter_store.dart b/lib/src/stores/action_list/transaction_filter_store.dart
deleted file mode 100644
index 7da1ad74c..000000000
--- a/lib/src/stores/action_list/transaction_filter_store.dart
+++ /dev/null
@@ -1,69 +0,0 @@
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
-import 'package:cake_wallet/src/stores/action_list/transaction_list_item.dart';
-
-part 'transaction_filter_store.g.dart';
-
-class TransactionFilterStore = TransactionFilterStoreBase
-    with _$TransactionFilterStore;
-
-abstract class TransactionFilterStoreBase with Store {
-  TransactionFilterStoreBase(
-      {this.displayIncoming = true, this.displayOutgoing = true});
-
-  @observable
-  bool displayIncoming;
-
-  @observable
-  bool displayOutgoing;
-
-  @observable
-  DateTime startDate;
-
-  @observable
-  DateTime endDate;
-
-  @action
-  void toggleIncoming() => displayIncoming = !displayIncoming;
-
-  @action
-  void toggleOutgoing() => displayOutgoing = !displayOutgoing;
-
-  @action
-  void changeStartDate(DateTime date) => startDate = date;
-
-  @action
-  void changeEndDate(DateTime date) => endDate = date;
-
-  List<TransactionListItem> filtered({List<TransactionListItem> transactions}) {
-    List<TransactionListItem> _transactions = [];
-    final needToFilter = !displayOutgoing ||
-        !displayIncoming ||
-        (startDate != null && endDate != null);
-
-    if (needToFilter) {
-      _transactions = transactions.where((item) {
-        var allowed = true;
-
-        if (allowed && startDate != null && endDate != null) {
-          allowed = startDate.isBefore(item.transaction.date) &&
-              endDate.isAfter(item.transaction.date);
-        }
-
-        if (allowed && (!displayOutgoing || !displayIncoming)) {
-          allowed = (displayOutgoing &&
-                  item.transaction.direction ==
-                      TransactionDirection.outgoing) ||
-              (displayIncoming &&
-                  item.transaction.direction == TransactionDirection.incoming);
-        }
-
-        return allowed;
-      }).toList();
-    } else {
-      _transactions = transactions;
-    }
-
-    return _transactions;
-  }
-}
diff --git a/lib/src/stores/action_list/transaction_list_item.dart b/lib/src/stores/action_list/transaction_list_item.dart
deleted file mode 100644
index ba4ce19d6..000000000
--- a/lib/src/stores/action_list/transaction_list_item.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
-import 'package:cake_wallet/src/stores/action_list/action_list_item.dart';
-
-class TransactionListItem extends ActionListItem {
-  TransactionListItem({this.transaction});
-
-  final TransactionInfo transaction;
-
-  @override
-  DateTime get date => transaction.date;
-}
\ No newline at end of file
diff --git a/lib/src/stores/address_book/address_book_store.dart b/lib/src/stores/address_book/address_book_store.dart
deleted file mode 100644
index 6537f24c6..000000000
--- a/lib/src/stores/address_book/address_book_store.dart
+++ /dev/null
@@ -1,111 +0,0 @@
-//import 'package:mobx/mobx.dart';
-//import 'package:flutter/foundation.dart';
-//import 'package:cake_wallet/generated/i18n.dart';
-//import 'package:cake_wallet/src/domain/common/contact.dart';
-//import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-//import 'package:hive/hive.dart';
-//
-//part 'address_book_store.g.dart';
-//
-//class AddressBookStore = AddressBookStoreBase with _$AddressBookStore;
-//
-//abstract class AddressBookStoreBase with Store {
-//  AddressBookStoreBase({@required this.contacts}) {
-//    updateContactList();
-//    isDisabledStatus = true;
-//  }
-//
-//  @observable
-//  List<Contact> contactList;
-//
-//  @observable
-//  bool isDisabledStatus;
-//
-//  @observable
-//  bool isValid;
-//
-//  @observable
-//  String errorMessage;
-//
-//  Box<Contact> contacts;
-//
-//  @action
-//  Future add({Contact contact}) async => contacts.add(contact);
-//
-//  @action
-//  Future updateContactList() async => contactList = contacts.values.toList();
-//
-//  @action
-//  Future update({Contact contact}) async => contact.save();
-//
-//  @action
-//  Future delete({Contact contact}) async => await contact.delete();
-//
-//  @action
-//  void setDisabledStatus(bool isDisabled) {
-//    isDisabledStatus = isDisabled;
-//  }
-//
-//  void validateContactName(String value) {
-//    const pattern = '''^[^`,'"]{1,32}\$''';
-//    final regExp = RegExp(pattern);
-//    isValid = regExp.hasMatch(value);
-//    errorMessage = isValid ? null : S.current.error_text_contact_name;
-//  }
-//
-//  void validateAddress(String value, {CryptoCurrency cryptoCurrency}) {
-//    // XMR (95, 106), ADA (59, 92, 105), BCH (42), BNB (42), BTC (34, 42), DASH (34), EOS (42),
-//    // ETH (42), LTC (34), NANO (64, 65), TRX (34), USDT (42), XLM (56), XRP (34)
-//    const pattern = '^[0-9a-zA-Z]{95}\$|^[0-9a-zA-Z]{34}\$|^[0-9a-zA-Z]{42}\$|^[0-9a-zA-Z]{56}\$|^[0-9a-zA-Z]{59}\$|^[0-9a-zA-Z_]{64}\$|^[0-9a-zA-Z_]{65}\$|^[0-9a-zA-Z]{92}\$|^[0-9a-zA-Z]{105}\$|^[0-9a-zA-Z]{106}\$';
-//    final regExp = RegExp(pattern);
-//    isValid = regExp.hasMatch(value);
-//    if (isValid && cryptoCurrency != null) {
-//      switch (cryptoCurrency) {
-//        case CryptoCurrency.xmr:
-//          isValid = (value.length == 95)||(value.length == 106);
-//          break;
-//        case CryptoCurrency.ada:
-//          isValid = (value.length == 59)||(value.length == 92)||(value.length == 105);
-//          break;
-//        case CryptoCurrency.bch:
-//          isValid = (value.length == 42);
-//          break;
-//        case CryptoCurrency.bnb:
-//          isValid = (value.length == 42);
-//          break;
-//        case CryptoCurrency.btc:
-//          isValid = (value.length == 34)||(value.length == 42);
-//          break;
-//        case CryptoCurrency.dash:
-//          isValid = (value.length == 34);
-//          break;
-//        case CryptoCurrency.eos:
-//          isValid = (value.length == 42);
-//          break;
-//        case CryptoCurrency.eth:
-//          isValid = (value.length == 42);
-//          break;
-//        case CryptoCurrency.ltc:
-//          isValid = (value.length == 34);
-//          break;
-//        case CryptoCurrency.nano:
-//          isValid = (value.length == 64)||(value.length == 65);
-//          break;
-//        case CryptoCurrency.trx:
-//          isValid = (value.length == 34);
-//          break;
-//        case CryptoCurrency.usdt:
-//          isValid = (value.length == 42);
-//          break;
-//        case CryptoCurrency.xlm:
-//          isValid = (value.length == 56);
-//          break;
-//        case CryptoCurrency.xrp:
-//          isValid = (value.length == 34);
-//          break;
-//      }
-//    }
-//
-//    errorMessage = isValid ? null : S.current.error_text_address;
-//  }
-//}
diff --git a/lib/src/stores/auth/auth_store.dart b/lib/src/stores/auth/auth_store.dart
deleted file mode 100644
index 8844cd0ff..000000000
--- a/lib/src/stores/auth/auth_store.dart
+++ /dev/null
@@ -1,99 +0,0 @@
-//import 'dart:async';
-//import 'package:flutter/foundation.dart';
-//import 'package:shared_preferences/shared_preferences.dart';
-//import 'package:mobx/mobx.dart';
-//import 'package:cake_wallet/src/domain/services/user_service.dart';
-//import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-//import 'package:cake_wallet/view_model/auth_state.dart';
-//import 'package:cake_wallet/generated/i18n.dart';
-//
-//part 'auth_store.g.dart';
-//
-//class AuthStore = AuthStoreBase with _$AuthStore;
-//
-//abstract class AuthStoreBase with Store {
-//  AuthStoreBase(
-//      {@required this.userService,
-//      @required this.walletService,
-//      @required this.sharedPreferences}) {
-//    state = AuthenticationStateInitial();
-//    _failureCounter = 0;
-//  }
-//
-//  static const maxFailedLogins = 3;
-//  static const banTimeout = 180; // 3 mins
-//  final banTimeoutKey = S.current.auth_store_ban_timeout;
-//
-//  final UserService userService;
-//  final WalletService walletService;
-//
-//  final SharedPreferences sharedPreferences;
-//
-//  @observable
-//  AuthState state;
-//
-//  @observable
-//  int _failureCounter;
-//
-//  @action
-//  Future auth({String password}) async {
-//    state = AuthenticationStateInitial();
-//    final _banDuration = banDuration();
-//
-//    if (_banDuration != null) {
-//      state = AuthenticationBanned(
-//          error: S.current.auth_store_banned_for + '${_banDuration.inMinutes}' + S.current.auth_store_banned_minutes);
-//      return;
-//    }
-//
-//    state = AuthenticationInProgress();
-//    final isAuth = await userService.authenticate(password);
-//
-//    if (isAuth) {
-//      state = AuthenticatedSuccessfully();
-//      _failureCounter = 0;
-//    } else {
-//      _failureCounter += 1;
-//
-//      if (_failureCounter >= maxFailedLogins) {
-//        final banDuration = await ban();
-//        state = AuthenticationBanned(
-//            error: S.current.auth_store_banned_for + '${banDuration.inMinutes}' + S.current.auth_store_banned_minutes);
-//        return;
-//      }
-//
-//      state = AuthenticationFailure(error: S.current.auth_store_incorrect_password);
-//    }
-//  }
-//
-//  Duration banDuration() {
-//    final unbanTimestamp = sharedPreferences.getInt(banTimeoutKey);
-//
-//    if (unbanTimestamp == null) {
-//      return null;
-//    }
-//
-//    final unbanTime = DateTime.fromMillisecondsSinceEpoch(unbanTimestamp);
-//    final now = DateTime.now();
-//
-//    if (now.isAfter(unbanTime)) {
-//      return null;
-//    }
-//
-//    return Duration(milliseconds: unbanTimestamp - now.millisecondsSinceEpoch);
-//  }
-//
-//  Future<Duration> ban() async {
-//    final multiplier = _failureCounter - maxFailedLogins + 1;
-//    final timeout = (multiplier * banTimeout) * 1000;
-//    final unbanTimestamp = DateTime.now().millisecondsSinceEpoch + timeout;
-//    await sharedPreferences.setInt(banTimeoutKey, unbanTimestamp);
-//
-//    return Duration(milliseconds: timeout);
-//  }
-//
-//  @action
-//  void biometricAuth() {
-//    state = AuthenticatedSuccessfully();
-//  }
-//}
diff --git a/lib/src/stores/authentication/authentication_store.dart b/lib/src/stores/authentication/authentication_store.dart
deleted file mode 100644
index d03a52ba4..000000000
--- a/lib/src/stores/authentication/authentication_store.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/services/user_service.dart';
-
-part 'authentication_store.g.dart';
-
-class AuthenticationStore = AuthenticationStoreBase with _$AuthenticationStore;
-
-enum AuthenticationState {
-  uninitialized,
-  allowed,
-  denied,
-  authenticated,
-  unauthenticated,
-  active,
-  loading,
-  created,
-  restored,
-  readyToLogin
-}
-
-abstract class AuthenticationStoreBase with Store {
-  AuthenticationStoreBase({@required this.userService}) {
-    state = AuthenticationState.uninitialized;
-  }
-
-  final UserService userService;
-
-  @observable
-  AuthenticationState state;
-
-//  @observable
-//  String errorMessage;
-
-  Future started() async {
-    final canAuth = await userService.canAuthenticate();
-    state = canAuth ? AuthenticationState.allowed : AuthenticationState.denied;
-  }
-
-  @action
-  void created() {
-    state = AuthenticationState.created;
-  }
-
-  @action
-  void restored() {
-    state = AuthenticationState.restored;
-  }
-
-  @action
-  void loggedIn() {
-    state = AuthenticationState.authenticated;
-  }
-
-  @action
-  void inactive() {
-    state = AuthenticationState.unauthenticated;
-  }
-
-  @action
-  void active() {
-    state = AuthenticationState.active;
-  }
-
-  @action
-  void loggedOut() {
-    state = AuthenticationState.uninitialized;
-  }
-}
diff --git a/lib/src/stores/balance/balance_store.dart b/lib/src/stores/balance/balance_store.dart
deleted file mode 100644
index fc47c5667..000000000
--- a/lib/src/stores/balance/balance_store.dart
+++ /dev/null
@@ -1,134 +0,0 @@
-import 'dart:async';
-import 'package:cake_wallet/bitcoin/bitcoin_balance.dart';
-import 'package:mobx/mobx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/common/balance.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/domain/monero/monero_balance.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/calculate_fiat_amount.dart';
-import 'package:cake_wallet/src/stores/price/price_store.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-
-part 'balance_store.g.dart';
-
-class BalanceStore = BalanceStoreBase with _$BalanceStore;
-
-abstract class BalanceStoreBase with Store {
-  BalanceStoreBase(
-      {String fullBalance = '0.0',
-      String unlockedBalance = '0.0',
-      @required WalletService walletService,
-      @required SettingsStore settingsStore,
-      @required PriceStore priceStore}) {
-    fullBalance = fullBalance;
-    unlockedBalance = unlockedBalance;
-    isReversing = false;
-    _walletService = walletService;
-    _settingsStore = settingsStore;
-    _priceStore = priceStore;
-
-    if (_walletService.currentWallet != null) {
-      _onWalletChanged(_walletService.currentWallet);
-    }
-
-    _onWalletChangeSubscription = _walletService.onWalletChange
-        .listen((wallet) => _onWalletChanged(wallet));
-  }
-
-  @observable
-  String fullBalance;
-
-  @observable
-  String unlockedBalance;
-
-  @computed
-  String get fiatFullBalance {
-    if (fullBalance == null) {
-      return '0.00';
-    }
-
-    final symbol = PriceStoreBase.generateSymbolForPair(
-        fiat: _settingsStore.fiatCurrency, crypto: CryptoCurrency.xmr);
-    final price = _priceStore.prices[symbol];
-    return calculateFiatAmount(price: price, cryptoAmount: fullBalance);
-  }
-
-  @computed
-  String get fiatUnlockedBalance {
-    if (unlockedBalance == null) {
-      return '0.00';
-    }
-
-    final symbol = PriceStoreBase.generateSymbolForPair(
-        fiat: _settingsStore.fiatCurrency, crypto: CryptoCurrency.xmr);
-    final price = _priceStore.prices[symbol];
-    return calculateFiatAmount(price: price, cryptoAmount: unlockedBalance);
-  }
-
-  @observable
-  bool isReversing;
-
-  WalletService _walletService;
-  StreamSubscription<Wallet> _onWalletChangeSubscription;
-  StreamSubscription<Balance> _onBalanceChangeSubscription;
-  SettingsStore _settingsStore;
-  PriceStore _priceStore;
-
-  // @override
-  // void dispose() {
-  //   _onWalletChangeSubscription.cancel();
-
-  //   if (_onBalanceChangeSubscription != null) {
-  //     _onBalanceChangeSubscription.cancel();
-  //   }
-
-  //   super.dispose();
-  // }
-
-  Future _onBalanceChange(Balance balance) async {
-    if (balance is MoneroBalance) {
-      await _onMoneroBalanceChange(balance);
-    }
-
-    if (balance is BitcoinBalance) {
-      await _onBitcoinBalanceChange(balance);
-    }
-  }
-
-  Future _onMoneroBalanceChange(MoneroBalance balance) async {
-    if (this.fullBalance != balance.fullBalance) {
-      this.fullBalance = balance.fullBalance;
-    }
-
-    if (this.unlockedBalance != balance.unlockedBalance) {
-      this.unlockedBalance = balance.unlockedBalance;
-    }
-  }
-
-  Future _onBitcoinBalanceChange(BitcoinBalance balance) async {
-    fullBalance = balance.totalFormatted;
-    unlockedBalance = balance.totalFormatted;
-  }
-
-  Future _onWalletChanged(Wallet wallet) async {
-    if (_onBalanceChangeSubscription != null) {
-      await _onBalanceChangeSubscription.cancel();
-    }
-
-    _onBalanceChangeSubscription = _walletService.onBalanceChange
-        .listen((balance) async => await _onBalanceChange(balance));
-
-    await _updateBalances(wallet);
-  }
-
-  Future _updateBalances(Wallet wallet) async {
-    if (wallet == null) {
-      return;
-    }
-
-    fullBalance = await _walletService.getFullBalance();
-    unlockedBalance = await _walletService.getUnlockedBalance();
-  }
-}
diff --git a/lib/src/stores/exchange/exchange_store.dart b/lib/src/stores/exchange/exchange_store.dart
deleted file mode 100644
index 9ac6ef05c..000000000
--- a/lib/src/stores/exchange/exchange_store.dart
+++ /dev/null
@@ -1,352 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:hive/hive.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/exchange/changenow/changenow_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/changenow/changenow_request.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
-import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_trade_request.dart';
-import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_request.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:cake_wallet/src/stores/exchange/exchange_trade_state.dart';
-import 'package:cake_wallet/src/stores/exchange/limits_state.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/exchange/limits.dart';
-import 'package:intl/intl.dart';
-
-part 'exchange_store.g.dart';
-
-class ExchangeStore = ExchangeStoreBase with _$ExchangeStore;
-
-abstract class ExchangeStoreBase with Store {
-  ExchangeStoreBase(
-      {@required ExchangeProvider initialProvider,
-      @required CryptoCurrency initialDepositCurrency,
-      @required CryptoCurrency initialReceiveCurrency,
-      @required this.providerList,
-      @required this.trades,
-      @required this.walletStore}) {
-    provider = initialProvider;
-    depositCurrency = initialDepositCurrency;
-    receiveCurrency = initialReceiveCurrency;
-    isDepositAddressEnabled = !(depositCurrency == walletStore.type);
-    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
-    depositAmount = '';
-    receiveAmount = '';
-    depositAddress = '';
-    receiveAddress = '';
-    limitsState = LimitsInitialState();
-    tradeState = ExchangeTradeStateInitial();
-    _cryptoNumberFormat = NumberFormat()..maximumFractionDigits = 12;
-    loadLimits();
-  }
-
-  @observable
-  ExchangeProvider provider;
-
-  @observable
-  List<ExchangeProvider> providerList;
-
-  @observable
-  CryptoCurrency depositCurrency;
-
-  @observable
-  CryptoCurrency receiveCurrency;
-
-  @observable
-  LimitsState limitsState;
-
-  @observable
-  ExchangeTradeState tradeState;
-
-  @observable
-  String depositAmount;
-
-  @observable
-  String receiveAmount;
-
-  @observable
-  String depositAddress;
-
-  @observable
-  String receiveAddress;
-
-  @observable
-  bool isDepositAddressEnabled;
-
-  @observable
-  bool isReceiveAddressEnabled;
-
-  @observable
-  bool isValid;
-
-  @observable
-  String errorMessage;
-
-  Box<Trade> trades;
-
-  WalletStore walletStore;
-
-  Limits limits;
-
-  NumberFormat _cryptoNumberFormat;
-
-  @action
-  void changeProvider({ExchangeProvider provider}) {
-    this.provider = provider;
-    depositAmount = '';
-    receiveAmount = '';
-    loadLimits();
-  }
-
-  @action
-  void changeDepositCurrency({CryptoCurrency currency}) {
-    depositCurrency = currency;
-    _onPairChange();
-    isDepositAddressEnabled = !(depositCurrency == walletStore.type);
-    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
-  }
-
-  @action
-  void changeReceiveCurrency({CryptoCurrency currency}) {
-    receiveCurrency = currency;
-    _onPairChange();
-    isDepositAddressEnabled = !(depositCurrency == walletStore.type);
-    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
-  }
-
-  @action
-  void changeReceiveAmount({String amount}) {
-    receiveAmount = amount;
-
-    if (amount == null || amount.isEmpty) {
-      depositAmount = '';
-      receiveAmount = '';
-      return;
-    }
-
-    final _amount = double.parse(amount) ?? 0;
-
-    provider
-        .calculateAmount(
-            from: depositCurrency, to: receiveCurrency, amount: _amount)
-        .then((amount) => _cryptoNumberFormat.format(amount).toString().replaceAll(RegExp("\\,"), ""))
-        .then((amount) => depositAmount = amount);
-  }
-
-  @action
-  void changeDepositAmount({String amount}) {
-    depositAmount = amount;
-
-    if (amount == null || amount.isEmpty) {
-      depositAmount = '';
-      receiveAmount = '';
-      return;
-    }
-
-    final _amount = double.parse(amount);
-    provider
-        .calculateAmount(
-            from: depositCurrency, to: receiveCurrency, amount: _amount)
-        .then((amount) => _cryptoNumberFormat.format(amount).toString().replaceAll(RegExp("\\,"), ""))
-        .then((amount) => receiveAmount = amount);
-  }
-
-  @action
-  Future loadLimits() async {
-    limitsState = LimitsIsLoading();
-
-    try {
-      limits = await provider.fetchLimits(
-          from: depositCurrency, to: receiveCurrency);
-      limitsState = LimitsLoadedSuccessfully(limits: limits);
-    } catch (e) {
-      limitsState = LimitsLoadedFailure(error: e.toString());
-    }
-  }
-
-  @action
-  Future createTrade() async {
-    TradeRequest request;
-    String amount;
-    CryptoCurrency currency;
-
-    if (provider is XMRTOExchangeProvider) {
-      request = XMRTOTradeRequest(
-          from: depositCurrency,
-          to: receiveCurrency,
-          amount: depositAmount,
-          address: receiveAddress,
-          refundAddress: depositAddress);
-      amount = depositAmount;
-      currency = depositCurrency;
-    }
-
-    if (provider is ChangeNowExchangeProvider) {
-      request = ChangeNowRequest(
-          from: depositCurrency,
-          to: receiveCurrency,
-          amount: depositAmount,
-          refundAddress: depositAddress,
-          address: receiveAddress);
-      amount = depositAmount;
-      currency = depositCurrency;
-    }
-
-    if (provider is MorphTokenExchangeProvider) {
-      request = MorphTokenRequest(
-          from: depositCurrency,
-          to: receiveCurrency,
-          amount: depositAmount,
-          refundAddress: depositAddress,
-          address: receiveAddress);
-      amount = depositAmount;
-      currency = depositCurrency;
-    }
-
-    if (limitsState is LimitsLoadedSuccessfully && amount != null) {
-      if (double.parse(amount) < limits.min) {
-        tradeState = TradeIsCreatedFailure(error: S.current.error_text_minimal_limit("${provider.description}",
-            "${limits.min}", currency.toString()));
-      } else if (limits.max != null && double.parse(amount) > limits.max) {
-        tradeState = TradeIsCreatedFailure(error: S.current.error_text_maximum_limit("${provider.description}",
-            "${limits.max}", currency.toString()));
-      } else {
-        try {
-          tradeState = TradeIsCreating();
-          final trade = await provider.createTrade(request: request);
-          trade.walletId = walletStore.id;
-          await trades.add(trade);
-          tradeState = TradeIsCreatedSuccessfully(trade: trade);
-        } catch (e) {
-          tradeState = TradeIsCreatedFailure(error: e.toString());
-        }
-      }
-    } else {
-      tradeState = TradeIsCreatedFailure(error: S.current.error_text_limits_loading_failed("${provider.description}"));
-    }
-
-  }
-
-  @action
-  void reset() {
-    depositAmount = '';
-    receiveAmount = '';
-    depositCurrency = CryptoCurrency.xmr;
-    receiveCurrency = CryptoCurrency.btc;
-    depositAddress = depositCurrency == walletStore.type ? walletStore.address : '';
-    receiveAddress = receiveCurrency == walletStore.type ? walletStore.address : '';
-    isDepositAddressEnabled = !(depositCurrency == walletStore.type);
-    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
-    _onPairChange();
-  }
-
-  List<ExchangeProvider> providersForCurrentPair() {
-    return _providersForPair(from: depositCurrency, to: receiveCurrency);
-  }
-
-  List<ExchangeProvider> _providersForPair(
-      {CryptoCurrency from, CryptoCurrency to}) {
-    final providers = providerList
-        .where((provider) => provider.pairList
-            .where((pair) =>
-                pair.from == depositCurrency && pair.to == receiveCurrency)
-            .isNotEmpty)
-        .toList();
-
-    return providers;
-  }
-
-  void _onPairChange() {
-    final isPairExist = provider.pairList
-        .where((pair) =>
-            pair.from == depositCurrency && pair.to == receiveCurrency)
-        .isNotEmpty;
-
-    if (!isPairExist) {
-      final provider =
-          _providerForPair(from: depositCurrency, to: receiveCurrency);
-
-      if (provider != null) {
-        changeProvider(provider: provider);
-      }
-    }
-
-    depositAmount = '';
-    receiveAmount = '';
-
-    loadLimits();
-  }
-
-  ExchangeProvider _providerForPair({CryptoCurrency from, CryptoCurrency to}) {
-    final providers = _providersForPair(from: from, to: to);
-    return providers.isNotEmpty ? providers[0] : null;
-  }
-
-  void validateAddress(String value, {CryptoCurrency cryptoCurrency}) {
-    // XMR (95, 106), ADA (59, 92, 105), BCH (42), BNB (42), BTC (34, 42), DASH (34), EOS (42),
-    // ETH (42), LTC (34), NANO (64, 65), TRX (34), USDT (42), XLM (56), XRP (34)
-    const pattern = '^[0-9a-zA-Z]{95}\$|^[0-9a-zA-Z]{34}\$|^[0-9a-zA-Z]{42}\$|^[0-9a-zA-Z]{56}\$|^[0-9a-zA-Z]{59}\$|^[0-9a-zA-Z_]{64}\$|^[0-9a-zA-Z_]{65}\$|^[0-9a-zA-Z]{92}\$|^[0-9a-zA-Z]{105}\$|^[0-9a-zA-Z]{106}\$';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    if (isValid && cryptoCurrency != null) {
-      switch (cryptoCurrency) {
-        case CryptoCurrency.xmr:
-          isValid = (value.length == 95)||(value.length == 106);
-          break;
-        case CryptoCurrency.ada:
-          isValid = (value.length == 59)||(value.length == 92)||(value.length == 105);
-          break;
-        case CryptoCurrency.bch:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.bnb:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.btc:
-          isValid = (value.length == 34)||(value.length == 42);
-          break;
-        case CryptoCurrency.dash:
-          isValid = (value.length == 34);
-          break;
-        case CryptoCurrency.eos:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.eth:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.ltc:
-          isValid = (value.length == 34);
-          break;
-        case CryptoCurrency.nano:
-          isValid = (value.length == 64)||(value.length == 65);
-          break;
-        case CryptoCurrency.trx:
-          isValid = (value.length == 34);
-          break;
-        case CryptoCurrency.usdt:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.xlm:
-          isValid = (value.length == 56);
-          break;
-        case CryptoCurrency.xrp:
-          isValid = (value.length == 34);
-          break;
-      }
-    }
-
-    errorMessage = isValid ? null : S.current.error_text_address;
-  }
-
-  void validateCryptoCurrency(String value) {
-    const pattern = '^([0-9]+([.][0-9]{0,12})?|[.][0-9]{1,12})\$';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    errorMessage = isValid ? null : S.current.error_text_crypto_currency;
-  }
-}
diff --git a/lib/src/stores/exchange_template/exchange_template_store.dart b/lib/src/stores/exchange_template/exchange_template_store.dart
deleted file mode 100644
index 1311fba91..000000000
--- a/lib/src/stores/exchange_template/exchange_template_store.dart
+++ /dev/null
@@ -1,40 +0,0 @@
-import 'dart:async';
-import 'package:mobx/mobx.dart';
-import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
-
-part 'exchange_template_store.g.dart';
-
-class ExchangeTemplateStore = ExchangeTemplateBase with _$ExchangeTemplateStore;
-
-abstract class ExchangeTemplateBase with Store {
-  ExchangeTemplateBase({this.templateSource}) {
-    templates = ObservableList<ExchangeTemplate>();
-    update();
-  }
-
-  @observable
-  ObservableList<ExchangeTemplate> templates;
-
-  Box<ExchangeTemplate> templateSource;
-
-  @action
-  void update() =>
-      templates.replaceRange(0, templates.length, templateSource.values.toList());
-
-  @action
-  Future addTemplate({String amount, String depositCurrency, String receiveCurrency,
-    String provider, String depositAddress, String receiveAddress}) async {
-    final template = ExchangeTemplate(
-        amount: amount,
-        depositCurrency: depositCurrency,
-        receiveCurrency: receiveCurrency,
-        provider: provider,
-        depositAddress: depositAddress,
-        receiveAddress: receiveAddress);
-    await templateSource.add(template);
-  }
-
-  @action
-  Future remove({ExchangeTemplate template}) async => await template.delete();
-}
\ No newline at end of file
diff --git a/lib/src/stores/exchange_trade/exchange_trade_store.dart b/lib/src/stores/exchange_trade/exchange_trade_store.dart
deleted file mode 100644
index 517ac3012..000000000
--- a/lib/src/stores/exchange_trade/exchange_trade_store.dart
+++ /dev/null
@@ -1,74 +0,0 @@
-import 'dart:async';
-import 'package:mobx/mobx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/changenow/changenow_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart';
-import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-import 'package:hive/hive.dart';
-
-part 'exchange_trade_store.g.dart';
-
-class ExchangeTradeStore = ExchangeTradeStoreBase with _$ExchangeTradeStore;
-
-abstract class ExchangeTradeStoreBase with Store {
-  ExchangeTradeStoreBase(
-      {@required this.trade, @required WalletStore walletStore, @required this.trades}) {
-    isSendable = trade.from == walletStore.type ||
-        trade.provider == ExchangeProviderDescription.xmrto;
-
-    switch (trade.provider) {
-      case ExchangeProviderDescription.xmrto:
-        _provider = XMRTOExchangeProvider();
-        break;
-      case ExchangeProviderDescription.changeNow:
-        _provider = ChangeNowExchangeProvider();
-        break;
-      case ExchangeProviderDescription.morphToken:
-        _provider = MorphTokenExchangeProvider(trades: trades);
-        break;
-    }
-
-    _updateTrade();
-    _timer = Timer.periodic(Duration(seconds: 20), (_) async => _updateTrade());
-  }
-
-  @observable
-  Trade trade;
-
-  @observable
-  bool isSendable;
-
-  Box<Trade> trades;
-
-  ExchangeProvider _provider;
-
-  Timer _timer;
-
-  // @override
-  // void dispose() {
-  //   super.dispose();
-
-  //   if (_timer != null) {
-  //     _timer.cancel();
-  //   }
-  // }
-
-  @action
-  Future<void> _updateTrade() async {
-    try {
-      final updatedTrade = await _provider.findTradeById(id: trade.id);
-
-      if (updatedTrade.createdAt == null && trade.createdAt != null) {
-        updatedTrade.createdAt = trade.createdAt;
-      }
-
-      trade = updatedTrade;
-    } catch (e) {
-      print(e.toString());
-    }
-  }
-}
diff --git a/lib/src/stores/login/login_store.dart b/lib/src/stores/login/login_store.dart
deleted file mode 100644
index cd1756ccf..000000000
--- a/lib/src/stores/login/login_store.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
-
-part 'login_store.g.dart';
-
-abstract class LoginState {}
-
-class InitialLoginState extends LoginState {}
-
-class LoadingCurrentWallet extends LoginState {}
-
-class LoadedCurrentWalletSuccessfully extends LoginState {}
-
-class LoadedCurrentWalletFailure extends LoginState {
-  LoadedCurrentWalletFailure({this.errorMessage});
-  
-  final String errorMessage;
-}
-
-class LoginStore = LoginStoreBase with _$LoginStore;
-
-abstract class LoginStoreBase with Store {
-  LoginStoreBase(
-      {@required this.sharedPreferences, @required this.walletsService}) {
-    state = InitialLoginState();
-  }
-
-  final SharedPreferences sharedPreferences;
-  final WalletListService walletsService;
-
-  @observable
-  LoginState state;
-
-  @action
-  Future loadCurrentWallet() async {
-    state = InitialLoginState();
-
-    try {
-      state = LoadingCurrentWallet();
-      final walletName = sharedPreferences.getString('current_wallet_name');
-      await walletsService.openWallet(walletName);
-      state = LoadedCurrentWalletSuccessfully();
-    } catch (e) {
-      state = LoadedCurrentWalletFailure(errorMessage: e.toString());
-    }
-  }
-}
diff --git a/lib/src/stores/node_list/node_list_store.dart b/lib/src/stores/node_list/node_list_store.dart
deleted file mode 100644
index 20442477e..000000000
--- a/lib/src/stores/node_list/node_list_store.dart
+++ /dev/null
@@ -1,106 +0,0 @@
-import 'dart:async';
-import 'package:mobx/mobx.dart';
-import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/node_list.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-
-part 'node_list_store.g.dart';
-
-class NodeListStore = NodeListBase with _$NodeListStore;
-
-abstract class NodeListBase with Store {
-  NodeListBase({this.nodesSource}) {
-    nodes = ObservableList<Node>();
-    disabledState = true;
-    _onNodesChangeSubscription = nodesSource.watch().listen((e) => update());
-    update();
-  }
-
-  @observable
-  ObservableList<Node> nodes;
-
-  @observable
-  bool isValid;
-
-  @observable
-  String errorMessage;
-
-  @observable
-  bool disabledState;
-
-  Box<Node> nodesSource;
-
-  StreamSubscription<BoxEvent> _onNodesChangeSubscription;
-
-  // @override
-  // void dispose() {
-  //   super.dispose();
-
-  //   if (_onNodesChangeSubscription != null) {
-  //     _onNodesChangeSubscription.cancel();
-  //   }
-  // }
-
-  @action
-  void update() =>
-      nodes.replaceRange(0, nodes.length, nodesSource.values.toList());
-
-  @action
-  Future addNode(
-      {String address, String port, String login, String password}) async {
-    var uri = address;
-
-    if (port != null && port.isNotEmpty) {
-      uri += ':' + port;
-    }
-
-    final node = Node(uri: uri, login: login, password: password);
-    await nodesSource.add(node);
-  }
-
-  @action
-  Future remove({Node node}) async => await node.delete();
-
-  @action
-  Future reset() async => await resetToDefault(nodesSource);
-
-  @action
-  void setDisabledState(bool isDisable) {
-    disabledState = isDisable;
-  }
-
-  Future<bool> isNodeOnline(Node node) async {
-    try {
-      return await node.requestNode();
-    } catch (e) {
-      return false;
-    }
-  }
-
-  void validateNodeAddress(String value) {
-    const pattern =
-        '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\$|^[0-9a-zA-Z.]+\$';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    errorMessage = isValid ? null : S.current.error_text_node_address;
-  }
-
-  void validateNodePort(String value) {
-    const pattern = '^[0-9]{1,5}';
-    final regExp = RegExp(pattern);
-
-    if (regExp.hasMatch(value)) {
-      try {
-        final intValue = int.parse(value);
-        isValid = (intValue >= 0 && intValue <= 65535);
-      } catch (e) {
-        isValid = false;
-      }
-    } else {
-      isValid = false;
-    }
-
-    errorMessage = isValid ? null : S.current.error_text_node_port;
-  }
-}
diff --git a/lib/src/stores/price/price_store.dart b/lib/src/stores/price/price_store.dart
deleted file mode 100644
index f1db0771a..000000000
--- a/lib/src/stores/price/price_store.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/fetch_price.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-
-part 'price_store.g.dart';
-
-class PriceStore = PriceStoreBase with _$PriceStore;
-
-abstract class PriceStoreBase with Store {
-  PriceStoreBase() : prices = ObservableMap();
-
-  static String generateSymbolForPair(
-          {FiatCurrency fiat, CryptoCurrency crypto}) =>
-      crypto.toString().toUpperCase() + fiat.toString().toUpperCase();
-
-  @observable
-  ObservableMap<String, double> prices;
-
-  @action
-  Future updatePrice({FiatCurrency fiat, CryptoCurrency crypto}) async {
-    final symbol = generateSymbolForPair(fiat: fiat, crypto: crypto);
-    final price = await fetchPriceFor(fiat: fiat, crypto: crypto);
-    prices[symbol] = price;
-  }
-
-  @action
-  void changePriceForPair(
-      {FiatCurrency fiat, CryptoCurrency crypto, double price}) {
-    final symbol = generateSymbolForPair(fiat: fiat, crypto: crypto);
-    prices[symbol] = price;
-  }
-}
diff --git a/lib/src/stores/rescan/rescan_wallet_store.dart b/lib/src/stores/rescan/rescan_wallet_store.dart
deleted file mode 100644
index 0231fa300..000000000
--- a/lib/src/stores/rescan/rescan_wallet_store.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-
-part 'rescan_wallet_store.g.dart';
-
-class RescanWalletStore = RescanWalletStoreBase with _$RescanWalletStore;
-
-enum RescanWalletState { rescaning, none }
-
-abstract class RescanWalletStoreBase with Store {
-  RescanWalletStoreBase({@required WalletService walletService}) {
-    _walletService = walletService;
-    state = RescanWalletState.none;
-  }
-
-  @observable
-  RescanWalletState state;
-
-  WalletService _walletService;
-
-  @action
-  Future rescanCurrentWallet({int restoreHeight}) async {
-    state = RescanWalletState.rescaning;
-    await _walletService.rescan(restoreHeight: restoreHeight);
-    state = RescanWalletState.none;
-  }
-}
diff --git a/lib/src/stores/seed_language/seed_language_store.dart b/lib/src/stores/seed_language/seed_language_store.dart
deleted file mode 100644
index efd304fa0..000000000
--- a/lib/src/stores/seed_language/seed_language_store.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:mobx/mobx.dart';
-
-part 'seed_language_store.g.dart';
-
-const List<String> seedLanguages = [
-  'English',
-  'Chinese (simplified)',
-  'Dutch',
-  'German',
-  'Japanese',
-  'Portuguese',
-  'Russian',
-  'Spanish'
-];
-
-class SeedLanguageStore = SeedLanguageStoreBase with _$SeedLanguageStore;
-
-abstract class SeedLanguageStoreBase with Store {
-  SeedLanguageStoreBase() {
-    selectedSeedLanguage = seedLanguages[0];
-    currentRoute = '';
-  }
-
-  @observable
-  String selectedSeedLanguage;
-
-  String currentRoute;
-
-  @action
-  void setSelectedSeedLanguage(String seedLanguage) {
-    selectedSeedLanguage = seedLanguage;
-  }
-
-  void setCurrentRoute(String route) {
-    currentRoute = route;
-  }
-}
\ No newline at end of file
diff --git a/lib/src/stores/send/send_store.dart b/lib/src/stores/send/send_store.dart
deleted file mode 100644
index 77323a518..000000000
--- a/lib/src/stores/send/send_store.dart
+++ /dev/null
@@ -1,304 +0,0 @@
-import 'package:hive/hive.dart';
-import 'package:intl/intl.dart';
-import 'package:mobx/mobx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/domain/common/pending_transaction.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/monero/monero_transaction_creation_credentials.dart';
-import 'package:cake_wallet/src/domain/monero/transaction_description.dart';
-import 'package:cake_wallet/src/stores/price/price_store.dart';
-import 'package:cake_wallet/src/stores/send/sending_state.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/openalias_record.dart';
-
-part 'send_store.g.dart';
-
-class SendStore = SendStoreBase with _$SendStore;
-
-abstract class SendStoreBase with Store {
-  SendStoreBase(
-      {@required this.walletService,
-      this.settingsStore,
-      this.transactionDescriptions,
-      this.priceStore}) {
-    state = SendingStateInitial();
-    _pendingTransaction = null;
-    _cryptoNumberFormat = NumberFormat()..maximumFractionDigits = 12;
-    _fiatNumberFormat = NumberFormat()..maximumFractionDigits = 2;
-  }
-
-  WalletService walletService;
-  SettingsStore settingsStore;
-  PriceStore priceStore;
-  Box<TransactionDescription> transactionDescriptions;
-  String recordName;
-  String recordAddress;
-
-  @observable
-  SendingState state;
-
-  @observable
-  String fiatAmount;
-
-  @observable
-  String cryptoAmount;
-
-  @observable
-  String address;
-
-  @observable
-  bool isValid;
-
-  @observable
-  String errorMessage;
-
-  PendingTransaction get pendingTransaction => _pendingTransaction;
-  PendingTransaction _pendingTransaction;
-  NumberFormat _cryptoNumberFormat;
-  NumberFormat _fiatNumberFormat;
-  String _lastRecipientAddress;
-
-  @action
-  Future createTransaction(
-      {String address, String paymentId, String amount}) async {
-    state = CreatingTransaction();
-
-    try {
-      final _amount = amount != null
-          ? amount
-          : cryptoAmount == S.current.all
-              ? null
-              : cryptoAmount.replaceAll(',', '.');
-      final credentials = MoneroTransactionCreationCredentials(
-          address: address,
-          paymentId: paymentId ?? '',
-          amount: _amount,
-          priority: settingsStore.transactionPriority);
-
-      _pendingTransaction = await walletService.createTransaction(credentials);
-      state = TransactionCreatedSuccessfully();
-      _lastRecipientAddress = address;
-    } catch (e) {
-      state = SendingFailed(error: e.toString());
-    }
-  }
-
-  @action
-  Future commitTransaction() async {
-    try {
-      final transactionId = _pendingTransaction.hash;
-      state = TransactionCommiting();
-      await _pendingTransaction.commit();
-      state = TransactionCommitted();
-
-      if (settingsStore.shouldSaveRecipientAddress) {
-        await transactionDescriptions.add(TransactionDescription(
-            id: transactionId, recipientAddress: _lastRecipientAddress));
-      }
-    } catch (e) {
-      state = SendingFailed(error: e.toString());
-    }
-
-    _pendingTransaction = null;
-  }
-
-  @action
-  void setSendAll() {
-    cryptoAmount = 'ALL';
-    fiatAmount = '';
-  }
-
-  @action
-  void changeCryptoAmount(String amount) {
-    cryptoAmount = amount;
-
-    if (cryptoAmount != null && cryptoAmount.isNotEmpty) {
-      _calculateFiatAmount();
-    } else {
-      fiatAmount = '';
-    }
-  }
-
-  @action
-  void changeFiatAmount(String amount) {
-    fiatAmount = amount;
-
-    if (fiatAmount != null && fiatAmount.isNotEmpty) {
-      _calculateCryptoAmount();
-    } else {
-      cryptoAmount = '';
-    }
-  }
-
-  @action
-  Future _calculateFiatAmount() async {
-    final symbol = PriceStoreBase.generateSymbolForPair(
-        fiat: settingsStore.fiatCurrency, crypto: CryptoCurrency.xmr);
-    final price = priceStore.prices[symbol] ?? 0;
-
-    try {
-      final amount = double.parse(cryptoAmount) * price;
-      fiatAmount = _fiatNumberFormat.format(amount);
-    } catch (e) {
-      fiatAmount = '0.00';
-    }
-  }
-
-  @action
-  Future _calculateCryptoAmount() async {
-    final symbol = PriceStoreBase.generateSymbolForPair(
-        fiat: settingsStore.fiatCurrency, crypto: CryptoCurrency.xmr);
-    final price = priceStore.prices[symbol] ?? 0;
-
-    try {
-      final amount = double.parse(fiatAmount) / price;
-      cryptoAmount = _cryptoNumberFormat.format(amount);
-    } catch (e) {
-      cryptoAmount = '0.00';
-    }
-  }
-
-  @action
-  void changeAddress(String address) {
-    this.address = address;
-  }
-
-  @action
-  void clear() {
-    address = '';
-    cryptoAmount = '';
-    fiatAmount = '';
-  }
-
-  Future<bool> isOpenaliasRecord(String name) async {
-    final _openaliasRecord = await OpenaliasRecord
-        .fetchAddressAndName(OpenaliasRecord.formatDomainName(name));
-
-    recordAddress = _openaliasRecord.address;
-    recordName = _openaliasRecord.name;
-
-    return recordAddress != name;
-  }
-
-  void validateAddress(String value, {CryptoCurrency cryptoCurrency}) {
-    // XMR (95, 106), ADA (59, 92, 105), BCH (42), BNB (42), BTC (34, 42), DASH (34), EOS (42),
-    // ETH (42), LTC (34), NANO (64, 65), TRX (34), USDT (42), XLM (56), XRP (34)
-    const pattern = '^[0-9a-zA-Z]{95}\$|^[0-9a-zA-Z]{34}\$|^[0-9a-zA-Z]{42}\$|^[0-9a-zA-Z]{56}\$|^[0-9a-zA-Z]{59}\$|^[0-9a-zA-Z_]{64}\$|^[0-9a-zA-Z_]{65}\$|^[0-9a-zA-Z]{92}\$|^[0-9a-zA-Z]{105}\$|^[0-9a-zA-Z]{106}\$';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    if (isValid && cryptoCurrency != null) {
-      switch (cryptoCurrency) {
-        case CryptoCurrency.xmr:
-          isValid = (value.length == 95)||(value.length == 106);
-          break;
-        case CryptoCurrency.ada:
-          isValid = (value.length == 59)||(value.length == 92)||(value.length == 105);
-          break;
-        case CryptoCurrency.bch:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.bnb:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.btc:
-          isValid = (value.length == 34)||(value.length == 42);
-          break;
-        case CryptoCurrency.dash:
-          isValid = (value.length == 34);
-          break;
-        case CryptoCurrency.eos:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.eth:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.ltc:
-          isValid = (value.length == 34);
-          break;
-        case CryptoCurrency.nano:
-          isValid = (value.length == 64)||(value.length == 65);
-          break;
-        case CryptoCurrency.trx:
-          isValid = (value.length == 34);
-          break;
-        case CryptoCurrency.usdt:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.xlm:
-          isValid = (value.length == 56);
-          break;
-        case CryptoCurrency.xrp:
-          isValid = (value.length == 34);
-          break;
-      }
-    }
-
-    errorMessage = isValid ? null : S.current.error_text_address;
-  }
-
-  void validatePaymentID(String value) {
-    if (value.isEmpty) {
-      isValid = true;
-    } else {
-      const pattern = '^[A-Fa-f0-9]{16,64}\$';
-      final regExp = RegExp(pattern);
-      isValid = regExp.hasMatch(value);
-    }
-
-    errorMessage = isValid ? null : S.current.error_text_payment_id;
-  }
-
-  void validateXMR(String value, String availableBalance) {
-    const double maxValue = 18446744.073709551616;
-    const pattern = '^([0-9]+([.][0-9]{0,12})?|[.][0-9]{1,12})\$|ALL';
-    final regExp = RegExp(pattern);
-
-    if (regExp.hasMatch(value)) {
-      if (value == 'ALL') {
-        isValid = true;
-      } else {
-        try {
-          final dValue = double.parse(value);
-          final maxAvailable = double.parse(availableBalance);
-          isValid =
-              (dValue <= maxAvailable && dValue <= maxValue && dValue > 0);
-        } catch (e) {
-          isValid = false;
-        }
-      }
-    } else {
-      isValid = false;
-    }
-    
-    errorMessage = isValid ? null : S.current.error_text_xmr;
-  }
-
-  void validateFiat(String value, {double maxValue}) {
-    const double minValue = 0.01;
-
-    if (value.isEmpty && cryptoAmount == 'ALL') {
-      isValid = true;
-    } else {
-      const pattern = '^([0-9]+([.][0-9]{0,2})?|[.][0-9]{1,2})\$';
-      final regExp = RegExp(pattern);
-
-      if (regExp.hasMatch(value)) {
-        try {
-          final dValue = double.parse(value);
-          isValid = (dValue >= minValue && dValue <= maxValue);
-        } catch (e) {
-          isValid = false;
-        }
-      } else {
-        isValid = false;
-      }
-    }
-
-    errorMessage = isValid
-        ? null
-        : "Value of amount can't exceed available balance.\n"
-            "The number of fraction digits must be less or equal to 2";
-  }
-}
diff --git a/lib/src/stores/send/sending_state.dart b/lib/src/stores/send/sending_state.dart
deleted file mode 100644
index c584049c4..000000000
--- a/lib/src/stores/send/sending_state.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-import 'package:flutter/foundation.dart';
-
-abstract class SendingState {}
-
-class SendingStateInitial extends SendingState {}
-
-class CreatingTransaction extends SendingState {}
-
-class TransactionCreatedSuccessfully extends SendingState {}
-
-class TransactionCommiting extends SendingState {}
-
-class TransactionCommitted extends SendingState {}
-
-class SendingFailed extends SendingState {
-  SendingFailed({@required this.error});
-  
-  String error;
-}
diff --git a/lib/src/stores/send_template/send_template_store.dart b/lib/src/stores/send_template/send_template_store.dart
deleted file mode 100644
index 8617b693f..000000000
--- a/lib/src/stores/send_template/send_template_store.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-import 'dart:async';
-import 'package:mobx/mobx.dart';
-import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/template.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-
-part 'send_template_store.g.dart';
-
-class SendTemplateStore = SendTemplateBase with _$SendTemplateStore;
-
-abstract class SendTemplateBase with Store {
-  SendTemplateBase({this.templateSource}) {
-    templates = ObservableList<Template>();
-    update();
-  }
-
-  @observable
-  ObservableList<Template> templates;
-
-  @observable
-  bool isValid;
-
-  @observable
-  String errorMessage;
-
-  Box<Template> templateSource;
-
-  @action
-  void update() =>
-      templates.replaceRange(0, templates.length, templateSource.values.toList());
-
-  @action
-  Future addTemplate({String name, String address, String cryptoCurrency, String amount}) async {
-    final template = Template(name: name, address: address,
-                              cryptoCurrency: cryptoCurrency, amount: amount);
-    await templateSource.add(template);
-  }
-
-  @action
-  Future remove({Template template}) async => await template.delete();
-
-  void validateTemplate(String value) {
-    const pattern = '''^[^`,'"]{1,106}\$''';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    errorMessage = isValid ? null : S.current.error_text_template;
-  }
-}
\ No newline at end of file
diff --git a/lib/src/stores/settings/settings_store.dart b/lib/src/stores/settings/settings_store.dart
deleted file mode 100644
index 21b56a967..000000000
--- a/lib/src/stores/settings/settings_store.dart
+++ /dev/null
@@ -1,297 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:mobx/mobx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
-import 'package:cake_wallet/src/stores/action_list/action_list_display_mode.dart';
-import 'package:cake_wallet/src/screens/settings/items/item_headers.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/default_settings_migration.dart';
-import 'package:package_info/package_info.dart';
-import 'package:cake_wallet/src/domain/common/language.dart';
-import 'package:devicelocale/devicelocale.dart';
-import 'package:intl/intl.dart';
-
-part 'settings_store.g.dart';
-
-class SettingsStore = SettingsStoreBase with _$SettingsStore;
-
-abstract class SettingsStoreBase with Store {
-  SettingsStoreBase(
-      {@required SharedPreferences sharedPreferences,
-      @required Box<Node> nodes,
-      @required FiatCurrency initialFiatCurrency,
-      @required TransactionPriority initialTransactionPriority,
-      @required BalanceDisplayMode initialBalanceDisplayMode,
-      @required bool initialSaveRecipientAddress,
-      @required bool initialAllowBiometricalAuthentication,
-      @required bool initialDarkTheme,
-      this.actionlistDisplayMode,
-      @required int initialPinLength,
-      @required String initialLanguageCode,
-      @required String initialCurrentLocale}) {
-    fiatCurrency = initialFiatCurrency;
-    transactionPriority = initialTransactionPriority;
-    balanceDisplayMode = initialBalanceDisplayMode;
-    shouldSaveRecipientAddress = initialSaveRecipientAddress;
-    _sharedPreferences = sharedPreferences;
-    _nodes = nodes;
-    allowBiometricalAuthentication = initialAllowBiometricalAuthentication;
-    isDarkTheme = true;
-    defaultPinLength = initialPinLength;
-    languageCode = initialLanguageCode;
-    currentLocale = initialCurrentLocale;
-    itemHeaders = Map();
-
-    actionlistDisplayMode.observe(
-        (dynamic _) => _sharedPreferences.setInt(displayActionListModeKey,
-            serializeActionlistDisplayModes(actionlistDisplayMode)),
-        fireImmediately: false);
-
-    PackageInfo.fromPlatform().then((PackageInfo packageInfo) => currentVersion = packageInfo.version);
-
-  }
-
-  static const currentNodeIdKey = 'current_node_id';
-  static const currentFiatCurrencyKey = 'current_fiat_currency';
-  static const currentTransactionPriorityKey = 'current_fee_priority';
-  static const currentBalanceDisplayModeKey = 'current_balance_display_mode';
-  static const shouldSaveRecipientAddressKey = 'save_recipient_address';
-  static const allowBiometricalAuthenticationKey =
-      'allow_biometrical_authentication';
-  static const currentDarkTheme = 'dark_theme';
-  static const displayActionListModeKey = 'display_list_mode';
-  static const currentPinLength = 'current_pin_length';
-  static const currentLanguageCode = 'language_code';
-
-  static Future<SettingsStore> load(
-      {@required SharedPreferences sharedPreferences,
-      @required Box<Node> nodes,
-      @required FiatCurrency initialFiatCurrency,
-      @required TransactionPriority initialTransactionPriority,
-      @required BalanceDisplayMode initialBalanceDisplayMode}) async {
-    final currentFiatCurrency = FiatCurrency(
-        symbol: sharedPreferences.getString(currentFiatCurrencyKey));
-    final currentTransactionPriority = TransactionPriority.deserialize(
-        raw: sharedPreferences.getInt(currentTransactionPriorityKey));
-    final currentBalanceDisplayMode = BalanceDisplayMode.deserialize(
-        raw: sharedPreferences.getInt(currentBalanceDisplayModeKey));
-    final shouldSaveRecipientAddress =
-        sharedPreferences.getBool(shouldSaveRecipientAddressKey);
-    final allowBiometricalAuthentication =
-        sharedPreferences.getBool(allowBiometricalAuthenticationKey) == null
-            ? false
-            : sharedPreferences.getBool(allowBiometricalAuthenticationKey);
-    final savedDarkTheme = sharedPreferences.getBool(currentDarkTheme) == null
-        ? false
-        : sharedPreferences.getBool(currentDarkTheme);
-    final actionlistDisplayMode = ObservableList<ActionListDisplayMode>();
-    actionlistDisplayMode.addAll(deserializeActionlistDisplayModes(
-        sharedPreferences.getInt(displayActionListModeKey) ?? 11));
-    final defaultPinLength = sharedPreferences.getInt(currentPinLength) == null
-        ? 4
-        : sharedPreferences.getInt(currentPinLength);
-    final savedLanguageCode =
-        sharedPreferences.getString(currentLanguageCode) == null
-            ? await Language.localeDetection()
-            : sharedPreferences.getString(currentLanguageCode);
-    final initialCurrentLocale = await Devicelocale.currentLocale;
-
-    final store = SettingsStore(
-        sharedPreferences: sharedPreferences,
-        nodes: nodes,
-        initialFiatCurrency: currentFiatCurrency,
-        initialTransactionPriority: currentTransactionPriority,
-        initialBalanceDisplayMode: currentBalanceDisplayMode,
-        initialSaveRecipientAddress: shouldSaveRecipientAddress,
-        initialAllowBiometricalAuthentication: allowBiometricalAuthentication,
-        initialDarkTheme: savedDarkTheme,
-        actionlistDisplayMode: actionlistDisplayMode,
-        initialPinLength: defaultPinLength,
-        initialLanguageCode: savedLanguageCode,
-        initialCurrentLocale: initialCurrentLocale);
-
-    await store.loadSettings();
-
-    return store;
-  }
-
-  @observable
-  Node node;
-
-  @observable
-  FiatCurrency fiatCurrency;
-
-  @observable
-  ObservableList<ActionListDisplayMode> actionlistDisplayMode;
-
-  @observable
-  TransactionPriority transactionPriority;
-
-  @observable
-  BalanceDisplayMode balanceDisplayMode;
-
-  @observable
-  bool shouldSaveRecipientAddress;
-
-  @observable
-  bool allowBiometricalAuthentication;
-
-  @observable
-  bool isDarkTheme = true;
-
-  @observable
-  int defaultPinLength;
-
-  String languageCode;
-
-  String currentLocale;
-
-  @observable
-  Map<String, String> itemHeaders;
-
-  SharedPreferences _sharedPreferences;
-  Box<Node> _nodes;
-  String currentVersion;
-
-  @action
-  Future setAllowBiometricalAuthentication(
-      {@required bool allowBiometricalAuthentication}) async {
-    this.allowBiometricalAuthentication = allowBiometricalAuthentication;
-    await _sharedPreferences.setBool(
-        allowBiometricalAuthenticationKey, allowBiometricalAuthentication);
-  }
-
-  @action
-  Future saveDarkTheme({@required bool isDarkTheme}) async {
-    this.isDarkTheme = isDarkTheme;
-    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-        statusBarColor: isDarkTheme ? Colors.black : Colors.white));
-    await _sharedPreferences.setBool(currentDarkTheme, isDarkTheme);
-  }
-
-  @action
-  Future saveLanguageCode({@required String languageCode}) async {
-    this.languageCode = languageCode;
-    await _sharedPreferences.setString(currentLanguageCode, languageCode);
-  }
-
-  @action
-  Future setCurrentNode({@required Node node}) async {
-    this.node = node;
-    await _sharedPreferences.setInt(currentNodeIdKey, node.key as int);
-  }
-
-  @action
-  Future setCurrentFiatCurrency({@required FiatCurrency currency}) async {
-    this.fiatCurrency = currency;
-    await _sharedPreferences.setString(
-        currentFiatCurrencyKey, fiatCurrency.serialize());
-  }
-
-  @action
-  Future setCurrentTransactionPriority(
-      {@required TransactionPriority priority}) async {
-    this.transactionPriority = priority;
-    await _sharedPreferences.setInt(
-        currentTransactionPriorityKey, priority.serialize());
-  }
-
-  @action
-  Future setCurrentBalanceDisplayMode(
-      {@required BalanceDisplayMode balanceDisplayMode}) async {
-    this.balanceDisplayMode = balanceDisplayMode;
-    await _sharedPreferences.setInt(
-        currentBalanceDisplayModeKey, balanceDisplayMode.serialize());
-  }
-
-  @action
-  Future setSaveRecipientAddress(
-      {@required bool shouldSaveRecipientAddress}) async {
-    this.shouldSaveRecipientAddress = shouldSaveRecipientAddress;
-    await _sharedPreferences.setBool(
-        shouldSaveRecipientAddressKey, shouldSaveRecipientAddress);
-  }
-
-  Future loadSettings() async => node = await _fetchCurrentNode();
-
-  @action
-  void toggleTransactionsDisplay() =>
-      actionlistDisplayMode.contains(ActionListDisplayMode.transactions)
-          ? _hideTransaction()
-          : _showTransaction();
-
-  @action
-  void toggleTradesDisplay() =>
-      actionlistDisplayMode.contains(ActionListDisplayMode.trades)
-          ? _hideTrades()
-          : _showTrades();
-
-  @action
-  void _hideTransaction() =>
-      actionlistDisplayMode.remove(ActionListDisplayMode.transactions);
-
-  @action
-  void _hideTrades() =>
-      actionlistDisplayMode.remove(ActionListDisplayMode.trades);
-
-  @action
-  void _showTransaction() =>
-      actionlistDisplayMode.add(ActionListDisplayMode.transactions);
-
-  @action
-  void _showTrades() => actionlistDisplayMode.add(ActionListDisplayMode.trades);
-
-  @action
-  Future setDefaultPinLength({@required int pinLength}) async {
-    this.defaultPinLength = pinLength;
-    await _sharedPreferences.setInt(currentPinLength, pinLength);
-  }
-
-  Future<Node> _fetchCurrentNode() async {
-    final id = _sharedPreferences.getInt(currentNodeIdKey);
-
-    return _nodes.get(id);
-  }
-
-  @action
-  void setItemHeaders() {
-    itemHeaders.clear();
-    itemHeaders.addAll({
-      ItemHeaders.nodes: S.current.settings_nodes,
-      ItemHeaders.currentNode: S.current.settings_current_node,
-      ItemHeaders.wallets: S.current.settings_wallets,
-      ItemHeaders.displayBalanceAs: S.current.settings_display_balance_as,
-      ItemHeaders.currency: S.current.settings_currency,
-      ItemHeaders.feePriority: S.current.settings_fee_priority,
-      ItemHeaders.saveRecipientAddress:
-          S.current.settings_save_recipient_address,
-      ItemHeaders.personal: S.current.settings_personal,
-      ItemHeaders.changePIN: S.current.settings_change_pin,
-      ItemHeaders.changeLanguage: S.current.settings_change_language,
-      ItemHeaders.allowBiometricalAuthentication:
-          S.current.settings_allow_biometrical_authentication,
-      ItemHeaders.darkMode: S.current.settings_dark_mode,
-      ItemHeaders.support: S.current.settings_support,
-      ItemHeaders.termsAndConditions: S.current.settings_terms_and_conditions,
-      ItemHeaders.faq: S.current.faq,
-      ItemHeaders.version: S.current.version(currentVersion)
-    });
-  }
-
-  Future setCurrentNodeToDefault() async {
-//    await changeCurrentNodeToDefault(sharedPreferences: _sharedPreferences, nodes: _nodes);
-    await loadSettings();
-  }
-
-  DateFormat getCurrentDateFormat({
-    @required String formatUSA,
-    @required String formatDefault}) => currentLocale == 'en_US'
-          ? DateFormat(formatUSA, languageCode)
-          : DateFormat(formatDefault, languageCode);
-}
diff --git a/lib/src/stores/subaddress_creation/subaddress_creation_state.dart b/lib/src/stores/subaddress_creation/subaddress_creation_state.dart
deleted file mode 100644
index 0d8adaae2..000000000
--- a/lib/src/stores/subaddress_creation/subaddress_creation_state.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-abstract class SubaddressCreationState {}
-
-class SubaddressCreationStateInitial extends SubaddressCreationState {}
-
-class SubaddressIsCreating extends SubaddressCreationState {}
-
-class SubaddressCreatedSuccessfully extends SubaddressCreationState {}
-
-class SubaddressCreationFailure extends SubaddressCreationState {
-  SubaddressCreationFailure({this.error});
-  
-  String error;
-}
\ No newline at end of file
diff --git a/lib/src/stores/subaddress_creation/subaddress_creation_store.dart b/lib/src/stores/subaddress_creation/subaddress_creation_store.dart
deleted file mode 100644
index ad8eb2e82..000000000
--- a/lib/src/stores/subaddress_creation/subaddress_creation_store.dart
+++ /dev/null
@@ -1,110 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/monero/subaddress_list.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/stores/subaddress_creation/subaddress_creation_state.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-
-part 'subaddress_creation_store.g.dart';
-
-class SubadrressCreationStore = SubadrressCreationStoreBase
-    with _$SubadrressCreationStore;
-
-abstract class SubadrressCreationStoreBase with Store {
-  SubadrressCreationStoreBase({@required WalletService walletService}) {
-    state = SubaddressCreationStateInitial();
-    isDisabledStatus = true;
-
-    if (walletService.currentWallet != null) {
-      _onWalletChanged(walletService.currentWallet);
-    }
-
-    _onWalletChangeSubscription =
-        walletService.onWalletChange.listen(_onWalletChanged);
-  }
-
-  @observable
-  SubaddressCreationState state;
-
-  @observable
-  bool isValid;
-
-  @observable
-  String errorMessage;
-
-  @observable
-  bool isDisabledStatus;
-
-  SubaddressList _subaddressList;
-  StreamSubscription<Wallet> _onWalletChangeSubscription;
-  StreamSubscription<Account> _onAccountChangeSubscription;
-  Account _account;
-
-  @action
-  void setDisabledStatus(bool isDisabled) {
-    isDisabledStatus = isDisabled;
-  }
-
-  // @override
-  // void dispose() {
-  //   _onWalletChangeSubscription.cancel();
-
-  //   if (_onAccountChangeSubscription != null) {
-  //     _onAccountChangeSubscription.cancel();
-  //   }
-
-  //   super.dispose();
-  // }
-
-  Future<void> add({String label}) async {
-    try {
-      state = SubaddressIsCreating();
-      await _subaddressList.addSubaddress(
-          accountIndex: _account.id, label: label);
-      state = SubaddressCreatedSuccessfully();
-    } catch (e) {
-      state = SubaddressCreationFailure(error: e.toString());
-    }
-  }
-
-  Future<void> setLabel({int addressIndex, String label}) async {
-    try {
-      state = SubaddressIsCreating();
-      await _subaddressList.setLabelSubaddress(
-          accountIndex: _account.id,
-          addressIndex: addressIndex,
-          label: label
-      );
-      state = SubaddressCreatedSuccessfully();
-    } catch (e) {
-      state = SubaddressCreationFailure(error: e.toString());
-    }
-  }
-
-  Future<void> _onWalletChanged(Wallet wallet) async {
-    if (wallet is MoneroWallet) {
-      _account = wallet.account;
-      _subaddressList = wallet.getSubaddress();
-
-      _onAccountChangeSubscription =
-          wallet.onAccountChange.listen((account) async {
-        _account = account;
-        await _subaddressList.update(accountIndex: account.id);
-      });
-      return;
-    }
-
-    print('Incorrect wallet type for this operation (SubaddressList)');
-  }
-
-  void validateSubaddressName(String value) {
-    const pattern = '''^[^`,'"]{1,20}\$''';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    errorMessage = isValid ? null : S.current.error_text_subaddress_name;
-  }
-}
diff --git a/lib/src/stores/subaddress_list/subaddress_list_store.dart b/lib/src/stores/subaddress_list/subaddress_list_store.dart
deleted file mode 100644
index f6a1bf83e..000000000
--- a/lib/src/stores/subaddress_list/subaddress_list_store.dart
+++ /dev/null
@@ -1,78 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/monero/subaddress.dart';
-import 'package:cake_wallet/src/domain/monero/subaddress_list.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
-
-part 'subaddress_list_store.g.dart';
-
-class SubaddressListStore = SubaddressListStoreBase with _$SubaddressListStore;
-
-abstract class SubaddressListStoreBase with Store {
-  SubaddressListStoreBase({@required WalletService walletService}) {
-    subaddresses = ObservableList<Subaddress>();
-
-    if (walletService.currentWallet != null) {
-      _onWalletChanged(walletService.currentWallet);
-    }
-
-    _onWalletChangeSubscription =
-        walletService.onWalletChange.listen(_onWalletChanged);
-  }
-
-  @observable
-  ObservableList<Subaddress> subaddresses;
-
-  SubaddressList _subaddressList;
-  StreamSubscription<Wallet> _onWalletChangeSubscription;
-  StreamSubscription<List<Subaddress>> _onSubaddressesChangeSubscription;
-  StreamSubscription<Account> _onAccountChangeSubscription;
-  Account _account;
-
-  // @override
-  // void dispose() {
-  //   if (_onSubaddressesChangeSubscription != null) {
-  //     _onSubaddressesChangeSubscription.cancel();
-  //   }
-
-  //   if (_onAccountChangeSubscription != null) {
-  //     _onAccountChangeSubscription.cancel();
-  //   }
-
-  //   _onWalletChangeSubscription.cancel();
-  //   super.dispose();
-  // }
-
-  Future<void> _updateSubaddressList({int accountIndex}) async {
-    await _subaddressList.refresh(accountIndex: accountIndex);
-    subaddresses = ObservableList.of(_subaddressList.getAll());
-  }
-
-  Future<void> _onWalletChanged(Wallet wallet) async {
-    if (_onSubaddressesChangeSubscription != null) {
-      await _onSubaddressesChangeSubscription.cancel();
-    }
-
-    if (wallet is MoneroWallet) {
-      _account = wallet.account;
-      _subaddressList = wallet.getSubaddress();
-      _onSubaddressesChangeSubscription = _subaddressList.subaddresses
-          .listen((subaddress) => subaddresses = ObservableList.of(subaddress));
-      await _updateSubaddressList(accountIndex: _account.id);
-
-      _onAccountChangeSubscription =
-          wallet.onAccountChange.listen((account) async {
-        _account = account;
-        await _updateSubaddressList(accountIndex: account.id);
-      });
-
-      return;
-    }
-
-    print('Incorrect wallet type for this operation (SubaddressList)');
-  }
-}
diff --git a/lib/src/stores/sync/sync_store.dart b/lib/src/stores/sync/sync_store.dart
deleted file mode 100644
index 4f8c331b5..000000000
--- a/lib/src/stores/sync/sync_store.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-
-part 'sync_store.g.dart';
-
-class SyncStore = SyncStoreBase with _$SyncStore;
-
-abstract class SyncStoreBase with Store {
-  SyncStoreBase(
-      {SyncStatus syncStatus = const NotConnectedSyncStatus(),
-      @required WalletService walletService}) {
-    status = syncStatus;
-
-    if (walletService.currentWallet != null) {
-      _onWalletChanged(walletService.currentWallet);
-    }
-
-    _onWalletChangeSubscription =
-        walletService.onWalletChange.listen(_onWalletChanged);
-  }
-
-  @observable
-  SyncStatus status;
-
-  StreamSubscription<Wallet> _onWalletChangeSubscription;
-  StreamSubscription<SyncStatus> _onSyncStatusChangeSubscription;
-
-  // @override
-  // void dispose() {
-  //   if (_onSyncStatusChangeSubscription != null) {
-  //     _onSyncStatusChangeSubscription.cancel();
-  //   }
-
-  //   _onWalletChangeSubscription.cancel();
-  //   super.dispose();
-  // }
-
-  void _onWalletChanged(Wallet wallet) {
-    if (_onSyncStatusChangeSubscription != null) {
-      _onSyncStatusChangeSubscription.cancel();
-    }
-
-    _onSyncStatusChangeSubscription =
-        wallet.syncStatus.listen((status) => this.status = status);
-  }
-}
diff --git a/lib/src/stores/user/user_store.dart b/lib/src/stores/user/user_store.dart
deleted file mode 100644
index 2b9369d59..000000000
--- a/lib/src/stores/user/user_store.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-import 'package:mobx/mobx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/services/user_service.dart';
-import 'package:cake_wallet/src/stores/user/user_store_state.dart';
-
-part 'user_store.g.dart';
-
-class UserStore = UserStoreBase with _$UserStore;
-
-abstract class UserStoreBase with Store {
-  UserStoreBase({@required this.accountService});
-
-  UserService accountService;
-
-  @observable
-  UserStoreState state;
-
-  @observable
-  String errorMessage;
-
-  @action
-  Future set({String password}) async {
-    state = UserStoreStateInitial();
-
-    try {
-      await accountService.setPassword(password);
-      state = PinCodeSetSuccesfully();
-    } catch (e) {
-      state = PinCodeSetFailed(error: e.toString());
-    }
-  }
-}
diff --git a/lib/src/stores/user/user_store_state.dart b/lib/src/stores/user/user_store_state.dart
deleted file mode 100644
index 1b82200c4..000000000
--- a/lib/src/stores/user/user_store_state.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'package:flutter/foundation.dart';
-
-abstract class UserStoreState {}
-
-class UserStoreStateInitial extends UserStoreState {}
-
-class PinCodeSetSuccesfully extends UserStoreState {}
-
-class PinCodeSetFailed extends UserStoreState {
-  PinCodeSetFailed({@required this.error});
-
-  String error;
-}
diff --git a/lib/src/stores/wallet/wallet_keys_store.dart b/lib/src/stores/wallet/wallet_keys_store.dart
deleted file mode 100644
index 608e5a195..000000000
--- a/lib/src/stores/wallet/wallet_keys_store.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-
-part 'wallet_keys_store.g.dart';
-
-class WalletKeysStore = WalletKeysStoreBase with _$WalletKeysStore;
-
-abstract class WalletKeysStoreBase with Store {
-  WalletKeysStoreBase({@required WalletService walletService}) {
-    publicViewKey = '';
-    privateViewKey = '';
-    publicSpendKey = '';
-    privateSpendKey = '';
-
-    if (walletService.currentWallet != null) {
-      walletService.getKeys().then((keys) {
-        if (walletService.getType() == WalletType.monero) {
-          publicViewKey = keys['publicViewKey'];
-          privateViewKey = keys['privateViewKey'];
-          publicSpendKey = keys['publicSpendKey'];
-          privateSpendKey = keys['privateSpendKey'];
-        }
-
-        if (walletService.getType() == WalletType.bitcoin) {
-          publicViewKey = keys['publicKey'];
-          privateSpendKey = keys['privateKey'];
-        }
-      });
-    }
-  }
-
-  @observable
-  String publicViewKey;
-
-  @observable
-  String privateViewKey;
-
-  @observable
-  String publicSpendKey;
-
-  @observable
-  String privateSpendKey;
-}
diff --git a/lib/src/stores/wallet/wallet_store.dart b/lib/src/stores/wallet/wallet_store.dart
deleted file mode 100644
index 7887bab97..000000000
--- a/lib/src/stores/wallet/wallet_store.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-import 'dart:async';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/wallet.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
-import 'package:cake_wallet/src/domain/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/monero/subaddress.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-
-part 'wallet_store.g.dart';
-
-class WalletStore = WalletStoreBase with _$WalletStore;
-
-abstract class WalletStoreBase with Store {
-  WalletStoreBase({WalletService walletService, SettingsStore settingsStore}) {
-    _walletService = walletService;
-    _settingsStore = settingsStore;
-    name = '';
-    type = CryptoCurrency.xmr;
-    amountValue = '';
-
-    if (_walletService.currentWallet != null) {
-      _onWalletChanged(_walletService.currentWallet);
-    }
-
-    _onWalletChangeSubscription = _walletService.onWalletChange
-        .listen((wallet) async => await _onWalletChanged(wallet));
-  }
-
-  @observable
-  String address;
-
-  @observable
-  String name;
-
-  @observable
-  Subaddress subaddress;
-
-  @observable
-  Account account;
-
-  @observable
-  CryptoCurrency type;
-
-  @observable
-  String amountValue;
-
-  @observable
-  bool isValid;
-
-  @observable
-  String errorMessage;
-
-  String get id => name + type.toString().toLowerCase();
-
-  WalletService _walletService;
-  SettingsStore _settingsStore;
-  StreamSubscription<Wallet> _onWalletChangeSubscription;
-  StreamSubscription<Account> _onAccountChangeSubscription;
-  StreamSubscription<Subaddress> _onSubaddressChangeSubscription;
-
-  // @override
-  // void dispose() {
-  //   if (_onWalletChangeSubscription != null) {
-  //     _onWalletChangeSubscription.cancel();
-  //   }
-
-  //   if (_onAccountChangeSubscription != null) {
-  //     _onAccountChangeSubscription.cancel();
-  //   }
-
-  //   if (_onSubaddressChangeSubscription != null) {
-  //     _onSubaddressChangeSubscription.cancel();
-  //   }
-
-  //   super.dispose();
-  // }
-
-  @action
-  void setAccount(Account account) {
-    final wallet = _walletService.currentWallet;
-
-    if (wallet is MoneroWallet) {
-      this.account = account;
-      wallet.changeAccount(account);
-    }
-  }
-
-  @action
-  void setSubaddress(Subaddress subaddress) {
-    final wallet = _walletService.currentWallet;
-
-    if (wallet is MoneroWallet) {
-      this.subaddress = subaddress;
-      wallet.changeCurrentSubaddress(subaddress);
-    }
-  }
-
-  @action
-  Future reconnect() async =>
-      await _walletService.connectToNode(node: _settingsStore.node);
-
-  @action
-  Future rescan({int restoreHeight}) async =>
-      await _walletService.rescan(restoreHeight: restoreHeight);
-
-  @action
-  Future startSync() async => await _walletService.startSync();
-
-  @action
-  Future connectToNode({Node node}) async =>
-      await _walletService.connectToNode(node: node);
-
-  Future _onWalletChanged(Wallet wallet) async {
-    if (this == null) {
-      return;
-    }
-
-    address = await wallet.getAddress();
-    wallet.onNameChange.listen((name) => this.name = name);
-    wallet.onAddressChange.listen((address) => this.address = address);
-
-    if (wallet is MoneroWallet) {
-      _onAccountChangeSubscription =
-          wallet.onAccountChange.listen((account) => this.account = account);
-      _onSubaddressChangeSubscription = wallet.subaddress
-          .listen((subaddress) => this.subaddress = subaddress);
-    }
-  }
-
-  @action
-  void onChangedAmountValue(String value) =>
-      amountValue = value.isNotEmpty ? '?tx_amount=' + value : '';
-
-  @action
-  void validateAmount(String value) {
-    const double maxValue = 18446744.073709551616;
-
-    if (value.isEmpty) {
-      isValid = true;
-    } else {
-      const pattern = '^([0-9]+([.][0-9]{0,12})?|[.][0-9]{1,12})\$';
-      final regExp = RegExp(pattern);
-
-      if (regExp.hasMatch(value)) {
-        try {
-          final dValue = double.parse(value);
-          isValid = dValue <= maxValue;
-        } catch (e) {
-          isValid = false;
-        }
-      } else {
-        isValid = false;
-      }
-    }
-
-    errorMessage = isValid ? null : S.current.error_text_amount;
-  }
-
-  Future<bool> isConnected() async => await _walletService.isConnected();
-
-  WalletType getType() => _walletService.getType();
-
-  String get getAddress =>
-      getType() == WalletType.monero ? subaddress.address : address;
-}
diff --git a/lib/src/stores/wallet_creation/wallet_creation_state.dart b/lib/src/stores/wallet_creation/wallet_creation_state.dart
deleted file mode 100644
index 43223a1d0..000000000
--- a/lib/src/stores/wallet_creation/wallet_creation_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'package:flutter/foundation.dart';
-
-abstract class WalletCreationState {}
-
-class WalletCreationStateInitial extends WalletCreationState {}
-
-class WalletIsCreating extends WalletCreationState {}
-
-class WalletCreatedSuccessfully extends WalletCreationState {}
-
-class WalletCreationFailure extends WalletCreationState {
-  WalletCreationFailure({@required this.error});
-  
-  String error;
-}
\ No newline at end of file
diff --git a/lib/src/stores/wallet_creation/wallet_creation_store.dart b/lib/src/stores/wallet_creation/wallet_creation_store.dart
deleted file mode 100644
index 1be07bf42..000000000
--- a/lib/src/stores/wallet_creation/wallet_creation_store.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-import 'package:mobx/mobx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
-import 'package:cake_wallet/src/stores/wallet_creation/wallet_creation_state.dart';
-import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-
-part 'wallet_creation_store.g.dart';
-
-class WalletCreationStore = WalletCreationStoreBase with _$WalletCreationStore;
-
-abstract class WalletCreationStoreBase with Store {
-  WalletCreationStoreBase(
-      {@required this.authStore,
-      @required this.walletListService,
-      @required this.sharedPreferences}) {
-    state = WalletCreationStateInitial();
-    isDisabledStatus = true;
-  }
-
-  final AuthenticationStore authStore;
-  final WalletListService walletListService;
-  final SharedPreferences sharedPreferences;
-
-  @observable
-  WalletCreationState state;
-
-  @observable
-  String errorMessage;
-
-  @observable
-  bool isValid;
-
-  @observable
-  bool isDisabledStatus;
-
-  @action
-  Future create({String name, String language}) async {
-    state = WalletCreationStateInitial();
-
-    try {
-      state = WalletIsCreating();
-      await walletListService.create(name, language);
-      authStore.created();
-      state = WalletCreatedSuccessfully();
-    } catch (e) {
-      state = WalletCreationFailure(error: e.toString());
-    }
-  }
-
-  @action
-  void setDisabledStatus(bool isDisabled) {
-    isDisabledStatus = isDisabled;
-  }
-
-  void validateWalletName(String value) {
-    const pattern = '^[a-zA-Z0-9_]{1,15}\$';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    errorMessage = isValid ? null : S.current.error_text_wallet_name;
-  }
-}
diff --git a/lib/src/stores/wallet_list/wallet_list_store.dart b/lib/src/stores/wallet_list/wallet_list_store.dart
deleted file mode 100644
index 2f83a57d2..000000000
--- a/lib/src/stores/wallet_list/wallet_list_store.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/wallet_description.dart';
-import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-
-part 'wallet_list_store.g.dart';
-
-class WalletListStore = WalletListStoreBase with _$WalletListStore;
-
-abstract class WalletListStoreBase with Store {
-  WalletListStoreBase(
-      {@required WalletListService walletListService,
-      @required WalletService walletService}) {
-    _walletListService = walletListService;
-    _walletService = walletService;
-    wallets = [];
-    walletListService.getAll().then((walletList) => wallets = walletList);
-  }
-
-  @observable
-  List<WalletDescription> wallets;
-
-  WalletListService _walletListService;
-  WalletService _walletService;
-
-  bool isCurrentWallet(WalletDescription wallet) =>
-      _walletService.description?.name == wallet.name;
-
-  @action
-  Future<void> updateWalletList() async {
-    wallets = await _walletListService.getAll();
-  }
-
-  @action
-  Future<void> loadWallet(WalletDescription wallet) async {
-    await _walletListService.openWallet(wallet.name);
-  }
-
-  @action
-  Future<void> remove(WalletDescription wallet) async {
-    await _walletListService.remove(wallet);
-    await updateWalletList();
-  }
-}
diff --git a/lib/src/stores/wallet_restoration/wallet_restoration_state.dart b/lib/src/stores/wallet_restoration/wallet_restoration_state.dart
deleted file mode 100644
index afd6649e9..000000000
--- a/lib/src/stores/wallet_restoration/wallet_restoration_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'package:flutter/foundation.dart';
-
-abstract class WalletRestorationState {}
-
-class WalletRestorationStateInitial extends WalletRestorationState {}
-
-class WalletIsRestoring extends WalletRestorationState {}
-
-class WalletRestoredSuccessfully extends WalletRestorationState {}
-
-class WalletRestorationFailure extends WalletRestorationState {
-  WalletRestorationFailure({@required this.error});
-
-  String error;
-}
diff --git a/lib/src/stores/wallet_restoration/wallet_restoration_store.dart b/lib/src/stores/wallet_restoration/wallet_restoration_store.dart
deleted file mode 100644
index 4d1379c9f..000000000
--- a/lib/src/stores/wallet_restoration/wallet_restoration_store.dart
+++ /dev/null
@@ -1,190 +0,0 @@
-import 'package:mobx/mobx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
-import 'package:cake_wallet/src/domain/common/mnemonic_item.dart';
-import 'package:cake_wallet/src/stores/wallet_restoration/wallet_restoration_state.dart';
-import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-
-part 'wallet_restoration_store.g.dart';
-
-class WalletRestorationStore = WalleRestorationStoreBase
-    with _$WalletRestorationStore;
-
-abstract class WalleRestorationStoreBase with Store {
-  WalleRestorationStoreBase(
-      {this.seed,
-      @required this.authStore,
-      @required this.walletListService,
-      @required this.sharedPreferences}) {
-    state = WalletRestorationStateInitial();
-    disabledState = true;
-  }
-
-  final AuthenticationStore authStore;
-  final WalletListService walletListService;
-  final SharedPreferences sharedPreferences;
-
-  @observable
-  WalletRestorationState state;
-
-  @observable
-  String errorMessage;
-
-  @observable
-  bool isValid;
-
-  @observable
-  List<MnemonicItem> seed;
-
-  @observable
-  bool disabledState;
-
-  @action
-  Future restoreFromSeed({String name, String seed, int restoreHeight}) async {
-    state = WalletRestorationStateInitial();
-    final _seed = seed ?? _seedText();
-
-    try {
-      state = WalletIsRestoring();
-      await walletListService.restoreFromSeed(name, _seed, restoreHeight);
-      authStore.restored();
-      state = WalletRestoredSuccessfully();
-    } catch (e) {
-      state = WalletRestorationFailure(error: e.toString());
-    }
-  }
-
-  @action
-  Future restoreFromKeys(
-      {String name,
-      String language,
-      String address,
-      String viewKey,
-      String spendKey,
-      int restoreHeight}) async {
-    state = WalletRestorationStateInitial();
-
-    try {
-      state = WalletIsRestoring();
-      await walletListService.restoreFromKeys(
-          name, language, restoreHeight, address, viewKey, spendKey);
-      authStore.restored();
-      state = WalletRestoredSuccessfully();
-    } catch (e) {
-      state = WalletRestorationFailure(error: e.toString());
-    }
-  }
-
-  @action
-  void setSeed(List<MnemonicItem> seed) {
-    this.seed = seed;
-  }
-
-//  @action
-//  void validateSeed(List<MnemonicItem> seed) {
-//    final _seed = seed != null ? seed : this.seed;
-//    bool isValid = _seed != null ? _seed.length == 25 : false;
-//
-//    if (!isValid) {
-//      errorMessage = S.current.wallet_restoration_store_incorrect_seed_length;
-//      this.isValid = isValid;
-//      return;
-//    }
-//
-//    for (final item in _seed) {
-//      if (!item.isCorrect()) {
-//        isValid = false;
-//        break;
-//      }
-//    }
-//
-//    if (isValid) {
-//      errorMessage = null;
-//    }
-//
-//    this.isValid = isValid;
-//    return;
-//  }
-
-  String _seedText() {
-    return seed.fold('', (acc, item) => acc + ' ' + item.toString());
-  }
-
-  @action
-  void setDisabledState(bool isDisable) {
-    disabledState = isDisable;
-  }
-
-  void validateWalletName(String value) {
-    const pattern = '^[a-zA-Z0-9_]{1,15}\$';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    errorMessage = isValid ? null : S.current.error_text_wallet_name;
-  }
-
-  void validateAddress(String value, {CryptoCurrency cryptoCurrency}) {
-    // XMR (95, 106), ADA (59, 92, 105), BCH (42), BNB (42), BTC (34, 42), DASH (34), EOS (42),
-    // ETH (42), LTC (34), NANO (64, 65), TRX (34), USDT (42), XLM (56), XRP (34)
-    const pattern = '^[0-9a-zA-Z]{95}\$|^[0-9a-zA-Z]{34}\$|^[0-9a-zA-Z]{42}\$|^[0-9a-zA-Z]{56}\$|^[0-9a-zA-Z]{59}\$|^[0-9a-zA-Z_]{64}\$|^[0-9a-zA-Z_]{65}\$|^[0-9a-zA-Z]{92}\$|^[0-9a-zA-Z]{105}\$|^[0-9a-zA-Z]{106}\$';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    if (isValid && cryptoCurrency != null) {
-      switch (cryptoCurrency) {
-        case CryptoCurrency.xmr:
-          isValid = (value.length == 95)||(value.length == 106);
-          break;
-        case CryptoCurrency.ada:
-          isValid = (value.length == 59)||(value.length == 92)||(value.length == 105);
-          break;
-        case CryptoCurrency.bch:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.bnb:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.btc:
-          isValid = (value.length == 34)||(value.length == 42);
-          break;
-        case CryptoCurrency.dash:
-          isValid = (value.length == 34);
-          break;
-        case CryptoCurrency.eos:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.eth:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.ltc:
-          isValid = (value.length == 34);
-          break;
-        case CryptoCurrency.nano:
-          isValid = (value.length == 64)||(value.length == 65);
-          break;
-        case CryptoCurrency.trx:
-          isValid = (value.length == 34);
-          break;
-        case CryptoCurrency.usdt:
-          isValid = (value.length == 42);
-          break;
-        case CryptoCurrency.xlm:
-          isValid = (value.length == 56);
-          break;
-        case CryptoCurrency.xrp:
-          isValid = (value.length == 34);
-          break;
-      }
-    }
-
-    errorMessage = isValid ? null : S.current.error_text_address;
-  }
-
-  void validateKeys(String value) {
-    const pattern = '^[A-Fa-f0-9]{64}\$';
-    final regExp = RegExp(pattern);
-    isValid = regExp.hasMatch(value);
-    errorMessage = isValid ? null : S.current.error_text_keys;
-  }
-}
diff --git a/lib/src/stores/wallet_seed/wallet_seed_store.dart b/lib/src/stores/wallet_seed/wallet_seed_store.dart
deleted file mode 100644
index 833985d5b..000000000
--- a/lib/src/stores/wallet_seed/wallet_seed_store.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-
-part 'wallet_seed_store.g.dart';
-
-class WalletSeedStore = WalletSeedStoreBase with _$WalletSeedStore;
-
-abstract class WalletSeedStoreBase with Store {
-  WalletSeedStoreBase({@required WalletService walletService}) {
-    seed = '';
-
-    if (walletService.currentWallet != null) {
-      walletService.getSeed().then((seed) => this.seed = seed);
-      walletService.getName().then((name) => this.name = name);
-    }
-  }
-
-  @observable
-  String name;
-
-  @observable
-  String seed;
-}
diff --git a/lib/src/util/index.dart b/lib/src/util/index.dart
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart
index a1a7f343d..9f46505c8 100644
--- a/lib/src/widgets/address_text_field.dart
+++ b/lib/src/widgets/address_text_field.dart
@@ -1,31 +1,30 @@
-import 'package:cake_wallet/routes.dart';
-import 'package:flutter/material.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/contact.dart';
-import 'package:cake_wallet/src/domain/monero/subaddress.dart';
-import 'package:cake_wallet/src/domain/common/qr_scanner.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/entities/contact.dart';
+import 'package:cake_wallet/entities/qr_scanner.dart';
 
-enum AddressTextFieldOption { paste, qrCode, addressBook, subaddressList }
+enum AddressTextFieldOption { paste, qrCode, addressBook }
 
 class AddressTextField extends StatelessWidget {
   AddressTextField(
       {@required this.controller,
-        this.isActive = true,
-        this.placeholder,
-        this.options = const [
-          AddressTextFieldOption.qrCode,
-          AddressTextFieldOption.addressBook
-        ],
-        this.onURIScanned,
-        this.focusNode,
-        this.isBorderExist = true,
-        this.buttonColor,
-        this.borderColor,
-        this.iconColor,
-        this.textStyle,
-        this.hintStyle,
-        this.validator});
+      this.isActive = true,
+      this.placeholder,
+      this.options = const [
+        AddressTextFieldOption.qrCode,
+        AddressTextFieldOption.addressBook
+      ],
+      this.onURIScanned,
+      this.focusNode,
+      this.isBorderExist = true,
+      this.buttonColor,
+      this.borderColor,
+      this.iconColor,
+      this.textStyle,
+      this.hintStyle,
+      this.validator});
 
   static const prefixIconWidth = 34.0;
   static const prefixIconHeight = 34.0;
@@ -54,35 +53,35 @@ class AddressTextField extends StatelessWidget {
           enabled: isActive,
           controller: controller,
           focusNode: focusNode,
-          style: textStyle ?? TextStyle(
-              fontSize: 16,
-              color: Theme.of(context).primaryTextTheme.title.color
-          ),
+          style: textStyle ??
+              TextStyle(
+                  fontSize: 16,
+                  color: Theme.of(context).primaryTextTheme.title.color),
           decoration: InputDecoration(
             suffixIcon: SizedBox(
               width: prefixIconWidth * options.length +
                   (spaceBetweenPrefixIcons * options.length),
             ),
-            hintStyle: hintStyle ?? TextStyle(
-                fontSize: 16,
-                color: Theme.of(context).hintColor
-            ),
+            hintStyle: hintStyle ??
+                TextStyle(fontSize: 16, color: Theme.of(context).hintColor),
             hintText: placeholder ?? S.current.widgets_address,
             focusedBorder: isBorderExist
                 ? UnderlineInputBorder(
-                borderSide: BorderSide(
-                    color: borderColor ?? Theme.of(context).dividerColor,
-                    width: 1.0))
+                    borderSide: BorderSide(
+                        color: borderColor ?? Theme.of(context).dividerColor,
+                        width: 1.0))
                 : InputBorder.none,
             disabledBorder: isBorderExist
                 ? UnderlineInputBorder(
-                borderSide:
-                BorderSide(color: borderColor ?? Theme.of(context).dividerColor, width: 1.0))
+                    borderSide: BorderSide(
+                        color: borderColor ?? Theme.of(context).dividerColor,
+                        width: 1.0))
                 : InputBorder.none,
             enabledBorder: isBorderExist
                 ? UnderlineInputBorder(
-                borderSide:
-                BorderSide(color: borderColor ?? Theme.of(context).dividerColor, width: 1.0))
+                    borderSide: BorderSide(
+                        color: borderColor ?? Theme.of(context).dividerColor,
+                        width: 1.0))
                 : InputBorder.none,
           ),
           validator: validator,
@@ -97,9 +96,7 @@ class AddressTextField extends StatelessWidget {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   SizedBox(width: 5),
-                  if (this
-                      .options
-                      .contains(AddressTextFieldOption.paste)) ...[
+                  if (this.options.contains(AddressTextFieldOption.paste)) ...[
                     Container(
                         width: prefixIconWidth,
                         height: prefixIconHeight,
@@ -109,12 +106,20 @@ class AddressTextField extends StatelessWidget {
                           child: Container(
                               padding: EdgeInsets.all(8),
                               decoration: BoxDecoration(
-                                  color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
+                                  color: buttonColor ??
+                                      Theme.of(context)
+                                          .accentTextTheme
+                                          .title
+                                          .color,
                                   borderRadius:
-                                  BorderRadius.all(Radius.circular(6))),
+                                      BorderRadius.all(Radius.circular(6))),
                               child: Image.asset(
-                                  'assets/images/duplicate.png',
-                                  color: iconColor ?? Theme.of(context).primaryTextTheme.display1.decorationColor,
+                                'assets/images/duplicate.png',
+                                color: iconColor ??
+                                    Theme.of(context)
+                                        .primaryTextTheme
+                                        .display1
+                                        .decorationColor,
                               )),
                         )),
                   ],
@@ -128,11 +133,20 @@ class AddressTextField extends StatelessWidget {
                           child: Container(
                               padding: EdgeInsets.all(8),
                               decoration: BoxDecoration(
-                                  color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
+                                  color: buttonColor ??
+                                      Theme.of(context)
+                                          .accentTextTheme
+                                          .title
+                                          .color,
                                   borderRadius:
-                                  BorderRadius.all(Radius.circular(6))),
-                              child: Image.asset('assets/images/qr_code_icon.png',
-                                color: iconColor ?? Theme.of(context).primaryTextTheme.display1.decorationColor,
+                                      BorderRadius.all(Radius.circular(6))),
+                              child: Image.asset(
+                                'assets/images/qr_code_icon.png',
+                                color: iconColor ??
+                                    Theme.of(context)
+                                        .primaryTextTheme
+                                        .display1
+                                        .decorationColor,
                               )),
                         ))
                   ],
@@ -148,40 +162,26 @@ class AddressTextField extends StatelessWidget {
                           child: Container(
                               padding: EdgeInsets.all(8),
                               decoration: BoxDecoration(
-                                  color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
+                                  color: buttonColor ??
+                                      Theme.of(context)
+                                          .accentTextTheme
+                                          .title
+                                          .color,
                                   borderRadius:
-                                  BorderRadius.all(Radius.circular(6))),
+                                      BorderRadius.all(Radius.circular(6))),
                               child: Image.asset(
-                                  'assets/images/open_book.png',
-                                  color: iconColor ?? Theme.of(context).primaryTextTheme.display1.decorationColor,
+                                'assets/images/open_book.png',
+                                color: iconColor ??
+                                    Theme.of(context)
+                                        .primaryTextTheme
+                                        .display1
+                                        .decorationColor,
                               )),
                         ))
-                  ],
-                  if (this
-                      .options
-                      .contains(AddressTextFieldOption.subaddressList)) ...[
-                    Container(
-                        width: prefixIconWidth,
-                        height: prefixIconHeight,
-                        padding: EdgeInsets.only(top: 0),
-                        child: InkWell(
-                          onTap: () async => _presetSubaddressListPicker(context),
-                          child: Container(
-                              padding: EdgeInsets.all(8),
-                              decoration: BoxDecoration(
-                                  color: buttonColor ?? Theme.of(context).accentTextTheme.title.color,
-                                  borderRadius:
-                                  BorderRadius.all(Radius.circular(6))),
-                              child: Image.asset(
-                                  'assets/images/receive_icon_raw.png',
-                                  color: iconColor ?? Theme.of(context).primaryTextTheme.display1.decorationColor,
-                              )),
-                        )),
-                  ],
+                  ]
                 ],
               ),
-            )
-        )
+            ))
       ],
     );
   }
@@ -217,15 +217,6 @@ class AddressTextField extends StatelessWidget {
     }
   }
 
-  Future<void> _presetSubaddressListPicker(BuildContext context) async {
-    final subaddress = await Navigator.of(context, rootNavigator: true)
-        .pushNamed(Routes.subaddressList);
-
-    if (subaddress is Subaddress && subaddress.address != null) {
-      controller.text = subaddress.address;
-    }
-  }
-
   Future<void> _pasteAddress(BuildContext context) async {
     String address;
 
@@ -235,4 +226,4 @@ class AddressTextField extends StatelessWidget {
       controller.text = address;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/widgets/blockchain_height_widget.dart b/lib/src/widgets/blockchain_height_widget.dart
index 2f6105887..87d64b222 100644
--- a/lib/src/widgets/blockchain_height_widget.dart
+++ b/lib/src/widgets/blockchain_height_widget.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/monero/get_height_by_date.dart';
+import 'package:cake_wallet/monero/get_height_by_date.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 
 class BlockchainHeightWidget extends StatefulWidget {
diff --git a/lib/src/widgets/seed_widget.dart b/lib/src/widgets/seed_widget.dart
index 535df3940..208fef821 100644
--- a/lib/src/widgets/seed_widget.dart
+++ b/lib/src/widgets/seed_widget.dart
@@ -4,7 +4,7 @@ import 'package:flutter/services.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/core/seed_validator.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/domain/common/mnemonic_item.dart';
+import 'package:cake_wallet/entities/mnemonic_item.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:flutter/widgets.dart';
 
diff --git a/lib/store/contact_list_store.dart b/lib/store/contact_list_store.dart
index 1f923e8cc..ca3d0bcf0 100644
--- a/lib/store/contact_list_store.dart
+++ b/lib/store/contact_list_store.dart
@@ -1,5 +1,5 @@
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/contact.dart';
+import 'package:cake_wallet/entities/contact.dart';
 
 part 'contact_list_store.g.dart';
 
diff --git a/lib/store/dashboard/fiat_conversion_store.dart b/lib/store/dashboard/fiat_conversion_store.dart
new file mode 100644
index 000000000..48aed82b7
--- /dev/null
+++ b/lib/store/dashboard/fiat_conversion_store.dart
@@ -0,0 +1,13 @@
+import 'package:mobx/mobx.dart';
+
+part 'fiat_conversion_store.g.dart';
+
+class FiatConversionStore = FiatConversionStoreBase
+    with _$FiatConversionStore;
+
+abstract class FiatConversionStoreBase with Store {
+  FiatConversionStoreBase() : price = 0.0;
+
+  @observable
+  double price;
+}
diff --git a/lib/store/dashboard/fiat_convertation_store.dart b/lib/store/dashboard/fiat_convertation_store.dart
deleted file mode 100644
index 1b1a59b57..000000000
--- a/lib/store/dashboard/fiat_convertation_store.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-import 'package:mobx/mobx.dart';
-
-part 'fiat_convertation_store.g.dart';
-
-class FiatConvertationStore = FiatConvertationStoreBase with _$FiatConvertationStore;
-
-abstract class FiatConvertationStoreBase with Store {
-  FiatConvertationStoreBase() {
-    setPrice(0.0);
-  }
-
-  @observable
-  double price;
-
-  @action
-  void setPrice(double price) {
-    this.price = price;
-  }
-}
\ No newline at end of file
diff --git a/lib/store/dashboard/trade_filter_store.dart b/lib/store/dashboard/trade_filter_store.dart
index 181f9b0f0..46e1193bb 100644
--- a/lib/store/dashboard/trade_filter_store.dart
+++ b/lib/store/dashboard/trade_filter_store.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
 
 part 'trade_filter_store.g.dart';
diff --git a/lib/store/dashboard/trades_store.dart b/lib/store/dashboard/trades_store.dart
index 26a6b292b..6c8a0fd9c 100644
--- a/lib/store/dashboard/trades_store.dart
+++ b/lib/store/dashboard/trades_store.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:hive/hive.dart';
diff --git a/lib/store/dashboard/transaction_filter_store.dart b/lib/store/dashboard/transaction_filter_store.dart
index b55f51795..aca1b6c37 100644
--- a/lib/store/dashboard/transaction_filter_store.dart
+++ b/lib/store/dashboard/transaction_filter_store.dart
@@ -1,5 +1,5 @@
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
+import 'package:cake_wallet/entities/transaction_direction.dart';
 import 'package:cake_wallet/view_model/dashboard/transaction_list_item.dart';
 
 part 'transaction_filter_store.g.dart';
diff --git a/lib/store/node_list_store.dart b/lib/store/node_list_store.dart
index 2c72cbe99..0ff958e3f 100644
--- a/lib/store/node_list_store.dart
+++ b/lib/store/node_list_store.dart
@@ -1,5 +1,9 @@
+import 'dart:async';
+import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/utils/mobx.dart';
 
 part 'node_list_store.g.dart';
 
@@ -8,6 +12,23 @@ class NodeListStore = NodeListStoreBase with _$NodeListStore;
 abstract class NodeListStoreBase with Store {
   NodeListStoreBase() : nodes = ObservableList<Node>();
 
+  static StreamSubscription<BoxEvent> _onNodesSourceChange;
+  static NodeListStore _instance;
+
+  static NodeListStore get instance {
+    if (_instance != null) {
+      return _instance;
+    }
+
+    final nodeSource = getIt.get<Box<Node>>();
+    _instance = NodeListStore();
+    _instance.replaceValues(nodeSource.values);
+    _onNodesSourceChange?.cancel();
+    _onNodesSourceChange = bindBox(nodeSource, _instance.nodes);
+
+    return _instance;
+  }
+
   final ObservableList<Node> nodes;
 
   void replaceValues(Iterable<Node> newNodes) {
diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart
index 22589bedb..e17ce2de9 100644
--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@@ -1,17 +1,18 @@
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
-import 'package:devicelocale/devicelocale.dart';
 import 'package:package_info/package_info.dart';
+import 'package:devicelocale/devicelocale.dart';
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/common/language.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
-import 'package:cake_wallet/src/stores/action_list/action_list_display_mode.dart';
+import 'package:cake_wallet/entities/language.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
+import 'package:cake_wallet/entities/action_list_display_mode.dart';
 
 part 'settings_store.g.dart';
 
@@ -30,7 +31,6 @@ abstract class SettingsStoreBase with Store {
       @required int initialPinLength,
       @required String initialLanguageCode,
       @required String initialCurrentLocale,
-//      @required this.node,
       @required this.appVersion,
       @required Map<WalletType, Node> nodes,
       this.actionlistDisplayMode}) {
@@ -40,7 +40,7 @@ abstract class SettingsStoreBase with Store {
     shouldSaveRecipientAddress = initialSaveRecipientAddress;
     allowBiometricalAuthentication = initialAllowBiometricalAuthentication;
     isDarkTheme = initialDarkTheme;
-    defaultPinLength = initialPinLength;
+    pinCodeLength = initialPinLength;
     languageCode = initialLanguageCode;
     currentLocale = initialCurrentLocale;
     itemHeaders = {};
@@ -51,21 +51,17 @@ abstract class SettingsStoreBase with Store {
     reaction(
         (_) => allowBiometricalAuthentication,
         (bool biometricalAuthentication) => sharedPreferences.setBool(
-            allowBiometricalAuthenticationKey, biometricalAuthentication));
+            PreferencesKey.allowBiometricalAuthenticationKey,
+            biometricalAuthentication));
+
+    reaction(
+        (_) => pinCodeLength,
+        (int pinLength) => sharedPreferences.setInt(
+            PreferencesKey.currentPinLength, pinLength));
   }
 
-  static const currentNodeIdKey = 'current_node_id';
-  static const currentBitcoinElectrumSererIdKey = 'current_node_id_btc';
-  static const currentFiatCurrencyKey = 'current_fiat_currency';
-  static const currentTransactionPriorityKey = 'current_fee_priority';
-  static const currentBalanceDisplayModeKey = 'current_balance_display_mode';
-  static const shouldSaveRecipientAddressKey = 'save_recipient_address';
-  static const allowBiometricalAuthenticationKey =
-      'allow_biometrical_authentication';
-  static const currentDarkTheme = 'dark_theme';
-  static const displayActionListModeKey = 'display_list_mode';
-  static const currentPinLength = 'current_pin_length';
-  static const currentLanguageCode = 'language_code';
+  static const defaultPinLength = 4;
+  static const defaultActionsMode = 11;
 
   @observable
   FiatCurrency fiatCurrency;
@@ -89,7 +85,7 @@ abstract class SettingsStoreBase with Store {
   bool isDarkTheme;
 
   @observable
-  int defaultPinLength;
+  int pinCodeLength;
 
   @observable
   Map<String, String> itemHeaders;
@@ -107,22 +103,6 @@ abstract class SettingsStoreBase with Store {
 
   Node getCurrentNode(WalletType walletType) => nodes[walletType];
 
-  Future<void> setCurrentNode(Node node, WalletType walletType) async {
-    switch (walletType) {
-      case WalletType.bitcoin:
-        await _sharedPreferences.setInt(
-            currentBitcoinElectrumSererIdKey, node.key as int);
-        break;
-      case WalletType.monero:
-        await _sharedPreferences.setInt(currentNodeIdKey, node.key as int);
-        break;
-      default:
-        break;
-    }
-
-    nodes[walletType] = node;
-  }
-
   static Future<SettingsStore> load(
       {@required Box<Node> nodeSource,
       FiatCurrency initialFiatCurrency = FiatCurrency.usd,
@@ -131,29 +111,35 @@ abstract class SettingsStoreBase with Store {
           BalanceDisplayMode.availableBalance}) async {
     final sharedPreferences = await getIt.getAsync<SharedPreferences>();
     final currentFiatCurrency = FiatCurrency(
-        symbol: sharedPreferences.getString(currentFiatCurrencyKey));
+        symbol:
+            sharedPreferences.getString(PreferencesKey.currentFiatCurrencyKey));
     final currentTransactionPriority = TransactionPriority.deserialize(
-        raw: sharedPreferences.getInt(currentTransactionPriorityKey));
+        raw: sharedPreferences
+            .getInt(PreferencesKey.currentTransactionPriorityKey));
     final currentBalanceDisplayMode = BalanceDisplayMode.deserialize(
-        raw: sharedPreferences.getInt(currentBalanceDisplayModeKey));
+        raw: sharedPreferences
+            .getInt(PreferencesKey.currentBalanceDisplayModeKey));
     final shouldSaveRecipientAddress =
-        sharedPreferences.getBool(shouldSaveRecipientAddressKey);
-    final allowBiometricalAuthentication =
-        sharedPreferences.getBool(allowBiometricalAuthenticationKey) ?? false;
-    final savedDarkTheme = sharedPreferences.getBool(currentDarkTheme) ?? false;
+        sharedPreferences.getBool(PreferencesKey.shouldSaveRecipientAddressKey);
+    final allowBiometricalAuthentication = sharedPreferences
+            .getBool(PreferencesKey.allowBiometricalAuthenticationKey) ??
+        false;
+    final savedDarkTheme =
+        sharedPreferences.getBool(PreferencesKey.currentDarkTheme) ?? false;
     final actionListDisplayMode = ObservableList<ActionListDisplayMode>();
     actionListDisplayMode.addAll(deserializeActionlistDisplayModes(
-        sharedPreferences.getInt(displayActionListModeKey) ??
-            11)); // FIXME: Unnamed constant.
-    final defaultPinLength = sharedPreferences.getInt(currentPinLength) ??
-        4; // FIXME: Unnamed constant.
+        sharedPreferences.getInt(PreferencesKey.displayActionListModeKey) ??
+            defaultActionsMode));
+    final pinLength =
+        sharedPreferences.getInt(PreferencesKey.currentPinLength) ??
+            defaultPinLength;
     final savedLanguageCode =
-        sharedPreferences.getString(currentLanguageCode) ??
+        sharedPreferences.getString(PreferencesKey.currentLanguageCode) ??
             await Language.localeDetection();
     final initialCurrentLocale = await Devicelocale.currentLocale;
-    final nodeId = sharedPreferences.getInt(currentNodeIdKey);
-    final bitcoinElectrumServerId =
-        sharedPreferences.getInt(currentBitcoinElectrumSererIdKey);
+    final nodeId = sharedPreferences.getInt(PreferencesKey.currentNodeIdKey);
+    final bitcoinElectrumServerId = sharedPreferences
+        .getInt(PreferencesKey.currentBitcoinElectrumSererIdKey);
     final moneroNode = nodeSource.get(nodeId);
     final bitcoinElectrumServer = nodeSource.get(bitcoinElectrumServerId);
     final packageInfo = await PackageInfo.fromPlatform();
@@ -173,8 +159,25 @@ abstract class SettingsStoreBase with Store {
         initialAllowBiometricalAuthentication: allowBiometricalAuthentication,
         initialDarkTheme: savedDarkTheme,
         actionlistDisplayMode: actionListDisplayMode,
-        initialPinLength: defaultPinLength,
+        initialPinLength: pinLength,
         initialLanguageCode: savedLanguageCode,
         initialCurrentLocale: initialCurrentLocale);
   }
+
+  Future<void> setCurrentNode(Node node, WalletType walletType) async {
+    switch (walletType) {
+      case WalletType.bitcoin:
+        await _sharedPreferences.setInt(
+            PreferencesKey.currentBitcoinElectrumSererIdKey, node.key as int);
+        break;
+      case WalletType.monero:
+        await _sharedPreferences.setInt(
+            PreferencesKey.currentNodeIdKey, node.key as int);
+        break;
+      default:
+        break;
+    }
+
+    nodes[walletType] = node;
+  }
 }
diff --git a/lib/store/templates/exchange_template_store.dart b/lib/store/templates/exchange_template_store.dart
index 1311fba91..0b010387f 100644
--- a/lib/store/templates/exchange_template_store.dart
+++ b/lib/store/templates/exchange_template_store.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:mobx/mobx.dart';
 import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
+import 'package:cake_wallet/exchange/exchange_template.dart';
 
 part 'exchange_template_store.g.dart';
 
diff --git a/lib/store/templates/send_template_store.dart b/lib/store/templates/send_template_store.dart
index f672e8041..b65362a1c 100644
--- a/lib/store/templates/send_template_store.dart
+++ b/lib/store/templates/send_template_store.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:mobx/mobx.dart';
 import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/template.dart';
+import 'package:cake_wallet/entities/template.dart';
 
 part 'send_template_store.g.dart';
 
diff --git a/lib/store/wallet_list_store.dart b/lib/store/wallet_list_store.dart
index 18eeb3984..a2c138322 100644
--- a/lib/store/wallet_list_store.dart
+++ b/lib/store/wallet_list_store.dart
@@ -1,5 +1,5 @@
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/wallet_description.dart';
+import 'package:cake_wallet/entities/wallet_description.dart';
 
 part 'wallet_list_store.g.dart';
 
diff --git a/lib/utils/date_formatter.dart b/lib/utils/date_formatter.dart
new file mode 100644
index 000000000..cd64ef910
--- /dev/null
+++ b/lib/utils/date_formatter.dart
@@ -0,0 +1,15 @@
+import 'package:intl/intl.dart';
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+
+class DateFormatter {
+  static String get currentLocalFormat {
+    final isUSA = getIt.get<SettingsStore>().currentLocale == 'en_US';
+    final format = isUSA ? 'yyyy.MM.dd, HH:mm' : 'dd.MM.yyyy, HH:mm';
+
+    return format;
+  }
+
+  static DateFormat withCurrentLocal() =>
+      DateFormat(currentLocalFormat, getIt.get<SettingsStore>().languageCode);
+}
diff --git a/lib/utils/language_list.dart b/lib/utils/language_list.dart
new file mode 100644
index 000000000..748a36bac
--- /dev/null
+++ b/lib/utils/language_list.dart
@@ -0,0 +1,10 @@
+class LanguageList {
+  static const english = 'English';
+  static const chineseSimplified = 'Chinese (simplified)';
+  static const dutch = 'Dutch';
+  static const german = 'German';
+  static const japanese = 'Japanese';
+  static const portuguese = 'Portuguese';
+  static const russian = 'Russian';
+  static const spanish = 'Spanish';
+}
\ No newline at end of file
diff --git a/lib/utils/mobx.dart b/lib/utils/mobx.dart
index 6a8413aff..25925df1f 100644
--- a/lib/utils/mobx.dart
+++ b/lib/utils/mobx.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 
diff --git a/lib/view_model/auth_state.dart b/lib/view_model/auth_state.dart
index 01e4c2576..052285a47 100644
--- a/lib/view_model/auth_state.dart
+++ b/lib/view_model/auth_state.dart
@@ -1,18 +1,6 @@
-abstract class AuthState {}
+import 'package:cake_wallet/core/execution_state.dart';
 
-class AuthenticationStateInitial extends AuthState {}
-
-class AuthenticationInProgress extends AuthState {}
-
-class AuthenticatedSuccessfully extends AuthState {}
-
-class AuthenticationFailure extends AuthState {
-  AuthenticationFailure({this.error});
-
-  final String error;
-}
-
-class AuthenticationBanned extends AuthState {
+class AuthenticationBanned extends ExecutionState {
   AuthenticationBanned({this.error});
 
   final String error;
diff --git a/lib/view_model/auth_view_model.dart b/lib/view_model/auth_view_model.dart
index c135ddb5a..76df95283 100644
--- a/lib/view_model/auth_view_model.dart
+++ b/lib/view_model/auth_view_model.dart
@@ -1,38 +1,47 @@
 import 'dart:async';
-import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/view_model/auth_state.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/entities/biometric_auth.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 
 part 'auth_view_model.g.dart';
 
 class AuthViewModel = AuthViewModelBase with _$AuthViewModel;
 
 abstract class AuthViewModelBase with Store {
-  AuthViewModelBase(
-      {@required this.authService, @required this.sharedPreferences}) {
-    state = AuthenticationStateInitial();
+  AuthViewModelBase(this._authService, this._sharedPreferences,
+      this._settingsStore, this._biometricAuth) {
+    state = InitialExecutionState();
     _failureCounter = 0;
   }
 
   static const maxFailedLogins = 3;
-  static const banTimeout = 180; // 3 mins
+  static const banTimeout = 180; // 3 minutes
   final banTimeoutKey = S.current.auth_store_ban_timeout;
 
-  final AuthService authService;
-  final SharedPreferences sharedPreferences;
-
   @observable
-  AuthState state;
+  ExecutionState state;
+
+  int get pinLength => _settingsStore.pinCodeLength;
+
+  bool get isBiometricalAuthenticationAllowed =>
+      _settingsStore.allowBiometricalAuthentication;
 
   @observable
   int _failureCounter;
 
+  final AuthService _authService;
+  final BiometricAuth _biometricAuth;
+  final SharedPreferences _sharedPreferences;
+  final SettingsStore _settingsStore;
+
   @action
   Future<void> auth({String password}) async {
-    state = AuthenticationStateInitial();
+    state = InitialExecutionState();
     final _banDuration = banDuration();
 
     if (_banDuration != null) {
@@ -43,11 +52,11 @@ abstract class AuthViewModelBase with Store {
       return;
     }
 
-    state = AuthenticationInProgress();
-    final isAuth = await authService.authenticate(password);
+    state = IsExecutingState();
+    final isSuccessfulAuthenticated = await _authService.authenticate(password);
 
-    if (isAuth) {
-      state = AuthenticatedSuccessfully();
+    if (isSuccessfulAuthenticated) {
+      state = ExecutedSuccessfullyState();
       _failureCounter = 0;
     } else {
       _failureCounter += 1;
@@ -61,13 +70,12 @@ abstract class AuthViewModelBase with Store {
         return;
       }
 
-      state =
-          AuthenticationFailure(error: S.current.auth_store_incorrect_password);
+      state = FailureState(S.current.auth_store_incorrect_password);
     }
   }
 
   Duration banDuration() {
-    final unbanTimestamp = sharedPreferences.getInt(banTimeoutKey);
+    final unbanTimestamp = _sharedPreferences.getInt(banTimeoutKey);
 
     if (unbanTimestamp == null) {
       return null;
@@ -87,11 +95,25 @@ abstract class AuthViewModelBase with Store {
     final multiplier = _failureCounter - maxFailedLogins + 1;
     final timeout = (multiplier * banTimeout) * 1000;
     final unbanTimestamp = DateTime.now().millisecondsSinceEpoch + timeout;
-    await sharedPreferences.setInt(banTimeoutKey, unbanTimestamp);
+    await _sharedPreferences.setInt(banTimeoutKey, unbanTimestamp);
 
     return Duration(milliseconds: timeout);
   }
 
   @action
-  void biometricAuth() => state = AuthenticatedSuccessfully();
+  Future<void> biometricAuth() async {
+    try {
+      final canBiometricAuth = await _biometricAuth.canCheckBiometrics();
+
+      if (canBiometricAuth) {
+        final isAuthenticated = await _biometricAuth.isAuthenticated();
+
+        if (isAuthenticated) {
+          state = ExecutedSuccessfullyState();
+        }
+      }
+    } catch(e) {
+      state = FailureState(e.toString());
+    }
+  }
 }
diff --git a/lib/view_model/contact_list/contact_list_view_model.dart b/lib/view_model/contact_list/contact_list_view_model.dart
index 87917b25a..d222cb6dd 100644
--- a/lib/view_model/contact_list/contact_list_view_model.dart
+++ b/lib/view_model/contact_list/contact_list_view_model.dart
@@ -1,10 +1,9 @@
 import 'dart:async';
-
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/core/contact_service.dart';
 import 'package:cake_wallet/store/contact_list_store.dart';
-import 'package:cake_wallet/src/domain/common/contact.dart';
+import 'package:cake_wallet/entities/contact.dart';
 import 'package:cake_wallet/utils/mobx.dart';
 
 part 'contact_list_view_model.g.dart';
diff --git a/lib/view_model/contact_list/contact_view_model.dart b/lib/view_model/contact_list/contact_view_model.dart
index 780f5ca66..059b6a210 100644
--- a/lib/view_model/contact_list/contact_view_model.dart
+++ b/lib/view_model/contact_list/contact_view_model.dart
@@ -1,10 +1,10 @@
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/core/contact_service.dart';
-import 'package:cake_wallet/src/domain/common/contact.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/view_model/contact_list/contact_view_model_state.dart';
+import 'package:cake_wallet/entities/contact.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 
 part 'contact_view_model.g.dart';
 
@@ -12,7 +12,7 @@ class ContactViewModel = ContactViewModelBase with _$ContactViewModel;
 
 abstract class ContactViewModelBase with Store {
   ContactViewModelBase(this._contacts, this._wallet, {Contact contact})
-      : state = InitialContactViewModelState(),
+      : state = InitialExecutionState(),
         currencies = CryptoCurrency.all,
         _contact = contact {
     name = _contact?.name;
@@ -21,7 +21,7 @@ abstract class ContactViewModelBase with Store {
   }
 
   @observable
-  ContactViewModelState state;
+  ExecutionState state;
 
   @observable
   String name;
@@ -39,7 +39,6 @@ abstract class ContactViewModelBase with Store {
       (address?.isNotEmpty ?? false);
 
   final List<CryptoCurrency> currencies;
-  // final ContactService _contactService;
   final WalletBase _wallet;
   final Box<Contact> _contacts;
   final Contact _contact;
@@ -48,30 +47,26 @@ abstract class ContactViewModelBase with Store {
   void reset() {
     address = '';
     name = '';
-    //currency = _wallet.currency;
     currency = null;
   }
 
   Future save() async {
     try {
-      state = ContactIsCreating();
+      state = IsExecutingState();
 
       if (_contact != null) {
         _contact.name = name;
         _contact.address = address;
         _contact.updateCryptoCurrency(currency: currency);
         await _contacts.put(_contact.key, _contact);
-        // await _contactService.update(_contact);
       } else {
         await _contacts
             .add(Contact(name: name, address: address, type: currency));
-        // await _contactService
-        //     .add(Contact(name: name, address: address, type: currency));
       }
 
-      state = ContactSavingSuccessfully();
+      state = ExecutedSuccessfullyState();
     } catch (e) {
-      state = ContactCreationFailure(e.toString());
+      state = FailureState(e.toString());
     }
   }
 }
diff --git a/lib/view_model/contact_list/contact_view_model_state.dart b/lib/view_model/contact_list/contact_view_model_state.dart
deleted file mode 100644
index ebdc31569..000000000
--- a/lib/view_model/contact_list/contact_view_model_state.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-abstract class ContactViewModelState {}
-
-class InitialContactViewModelState extends ContactViewModelState {}
-
-class ContactIsCreating extends ContactViewModelState {}
-
-class ContactSavingSuccessfully extends ContactViewModelState {}
-
-class ContactCreationFailure extends ContactViewModelState {
-  ContactCreationFailure(this.error);
-
-  final String error;
-}
\ No newline at end of file
diff --git a/lib/view_model/dashboard/balance_view_model.dart b/lib/view_model/dashboard/balance_view_model.dart
index 83a5a7275..8d1e70991 100644
--- a/lib/view_model/dashboard/balance_view_model.dart
+++ b/lib/view_model/dashboard/balance_view_model.dart
@@ -1,11 +1,11 @@
 import 'package:cake_wallet/bitcoin/bitcoin_wallet.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/calculate_fiat_amount.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/calculate_fiat_amount.dart';
 import 'package:cake_wallet/view_model/dashboard/wallet_balance.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cake_wallet/store/dashboard/fiat_convertation_store.dart';
+import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:mobx/mobx.dart';
 
@@ -22,7 +22,7 @@ abstract class BalanceViewModelBase with Store {
 
   final WalletBase wallet;
   final SettingsStore settingsStore;
-  final FiatConvertationStore fiatConvertationStore;
+  final FiatConversionStore fiatConvertationStore;
 
   WalletBalance _getWalletBalance() {
     final _wallet = wallet;
diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart
index ebf47f252..da6bdde61 100644
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@@ -1,12 +1,12 @@
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet.dart';
 import 'package:cake_wallet/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/transaction_direction.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/filter_item.dart';
 import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
@@ -15,8 +15,8 @@ import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/action_list_display_mode.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/store/dashboard/trades_store.dart';
diff --git a/lib/view_model/dashboard/trade_list_item.dart b/lib/view_model/dashboard/trade_list_item.dart
index a0fa24ca3..ec9cca36e 100644
--- a/lib/view_model/dashboard/trade_list_item.dart
+++ b/lib/view_model/dashboard/trade_list_item.dart
@@ -1,6 +1,6 @@
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
 
 class TradeListItem extends ActionListItem {
   TradeListItem({this.trade, this.displayMode});
diff --git a/lib/view_model/dashboard/transaction_list_item.dart b/lib/view_model/dashboard/transaction_list_item.dart
index 6081ef8eb..cba206ad0 100644
--- a/lib/view_model/dashboard/transaction_list_item.dart
+++ b/lib/view_model/dashboard/transaction_list_item.dart
@@ -1,12 +1,12 @@
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
 import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart';
-import 'package:cake_wallet/src/domain/monero/monero_transaction_info.dart';
-import 'package:cake_wallet/src/domain/monero/monero_amount_format.dart';
+import 'package:cake_wallet/monero/monero_transaction_info.dart';
+import 'package:cake_wallet/monero/monero_amount_format.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/common/calculate_fiat_amount_raw.dart';
+import 'package:cake_wallet/entities/calculate_fiat_amount_raw.dart';
 
 class TransactionListItem extends ActionListItem {
   TransactionListItem({
diff --git a/lib/view_model/exchange/exchange_trade_view_model.dart b/lib/view_model/exchange/exchange_trade_view_model.dart
index 414a40ebe..43490866e 100644
--- a/lib/view_model/exchange/exchange_trade_view_model.dart
+++ b/lib/view_model/exchange/exchange_trade_view_model.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/src/domain/exchange/changenow/changenow_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart';
+import 'package:cake_wallet/exchange/changenow/changenow_exchange_provider.dart';
+import 'package:cake_wallet/exchange/exchange_provider.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/morphtoken/morphtoken_exchange_provider.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+import 'package:cake_wallet/exchange/xmrto/xmrto_exchange_provider.dart';
 import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 7ab3a1044..d1a29c731 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -1,25 +1,25 @@
 import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/limits.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/src/stores/exchange/limits_state.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/exchange/exchange_provider.dart';
+import 'package:cake_wallet/exchange/limits.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+import 'package:cake_wallet/exchange/limits_state.dart';
 import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:intl/intl.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/stores/exchange/exchange_trade_state.dart';
-import 'package:cake_wallet/src/domain/exchange/changenow/changenow_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/changenow/changenow_request.dart';
-import 'package:cake_wallet/src/domain/exchange/trade_request.dart';
-import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_trade_request.dart';
-import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart';
-import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_request.dart';
+import 'package:cake_wallet/exchange/exchange_trade_state.dart';
+import 'package:cake_wallet/exchange/changenow/changenow_exchange_provider.dart';
+import 'package:cake_wallet/exchange/changenow/changenow_request.dart';
+import 'package:cake_wallet/exchange/trade_request.dart';
+import 'package:cake_wallet/exchange/xmrto/xmrto_exchange_provider.dart';
+import 'package:cake_wallet/exchange/xmrto/xmrto_trade_request.dart';
+import 'package:cake_wallet/exchange/morphtoken/morphtoken_exchange_provider.dart';
+import 'package:cake_wallet/exchange/morphtoken/morphtoken_request.dart';
 import 'package:cake_wallet/store/templates/exchange_template_store.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
+import 'package:cake_wallet/exchange/exchange_template.dart';
 
 part 'exchange_view_model.g.dart';
 
diff --git a/lib/view_model/monero_account_list/monero_account_edit_or_create_state.dart b/lib/view_model/monero_account_list/monero_account_edit_or_create_state.dart
deleted file mode 100644
index 664b1cd99..000000000
--- a/lib/view_model/monero_account_list/monero_account_edit_or_create_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'package:flutter/foundation.dart';
-
-abstract class MoneroAccountEditOrCreateState {}
-
-class InitialAccountCreationState extends MoneroAccountEditOrCreateState {}
-
-class AccountIsCreating extends MoneroAccountEditOrCreateState {}
-
-class AccountCreatedSuccessfully extends MoneroAccountEditOrCreateState {}
-
-class AccountCreationFailure extends MoneroAccountEditOrCreateState {
-  AccountCreationFailure({@required this.error});
-
-  final String error;
-}
\ No newline at end of file
diff --git a/lib/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart b/lib/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart
index 151a966ac..33e9dd1e5 100644
--- a/lib/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart
+++ b/lib/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart
@@ -1,7 +1,7 @@
 import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/monero/monero_account_list.dart';
 import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
-import 'package:cake_wallet/view_model/monero_account_list/monero_account_edit_or_create_state.dart';
 
 part 'monero_account_edit_or_create_view_model.g.dart';
 
@@ -11,14 +11,14 @@ class MoneroAccountEditOrCreateViewModel = MoneroAccountEditOrCreateViewModelBas
 abstract class MoneroAccountEditOrCreateViewModelBase with Store {
   MoneroAccountEditOrCreateViewModelBase(this._moneroAccountList,
       {AccountListItem accountListItem})
-      : state = InitialAccountCreationState(),
+      : state = InitialExecutionState(),
         isEdit = accountListItem != null,
         _accountListItem = accountListItem;
 
   final bool isEdit;
 
   @observable
-  MoneroAccountEditOrCreateState state;
+  ExecutionState state;
 
   @observable
   String label;
@@ -28,7 +28,7 @@ abstract class MoneroAccountEditOrCreateViewModelBase with Store {
 
   Future<void> save() async {
     try {
-      state = AccountIsCreating();
+      state = IsExecutingState();
 
       if (_accountListItem != null) {
         await _moneroAccountList.setLabelAccount(
@@ -37,9 +37,9 @@ abstract class MoneroAccountEditOrCreateViewModelBase with Store {
         await _moneroAccountList.addAccount(label: label);
       }
 
-      state = AccountCreatedSuccessfully();
+      state = ExecutedSuccessfullyState();
     } catch (e) {
-      state = AccountCreationFailure(error: e.toString());
+      state = FailureState(e.toString());
     }
   }
 }
diff --git a/lib/view_model/monero_account_list/monero_account_list_view_model.dart b/lib/view_model/monero_account_list/monero_account_list_view_model.dart
index c03fee8a3..c6d6aa686 100644
--- a/lib/view_model/monero_account_list/monero_account_list_view_model.dart
+++ b/lib/view_model/monero_account_list/monero_account_list_view_model.dart
@@ -1,5 +1,5 @@
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/monero/account.dart';
+import 'package:cake_wallet/monero/account.dart';
 import 'package:cake_wallet/monero/monero_wallet.dart';
 import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
 
diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart
index bf219e26b..fb6cd195e 100644
--- a/lib/view_model/node_list/node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart
@@ -1,9 +1,9 @@
+import 'package:cake_wallet/core/execution_state.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model_state.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 part 'node_create_or_edit_view_model.g.dart';
 
@@ -12,10 +12,10 @@ class NodeCreateOrEditViewModel = NodeCreateOrEditViewModelBase
 
 abstract class NodeCreateOrEditViewModelBase with Store {
   NodeCreateOrEditViewModelBase(this._nodeSource, this._wallet)
-      : state = InitialNodeCreateOrEditViewModelState();
+      : state = InitialExecutionState();
 
   @observable
-  NodeCreateOrEditViewModelState state;
+  ExecutionState state;
 
   @observable
   String address;
@@ -59,13 +59,13 @@ abstract class NodeCreateOrEditViewModelBase with Store {
   @action
   Future<void> save() async {
     try {
-      state = NodeIsCreating();
+      state = IsExecutingState();
       final node =
           Node(uri: uri, type: _wallet.type, login: login, password: password);
       await _nodeSource.add(node);
-      state = NodeCreatedSuccessfully();
+      state = ExecutedSuccessfullyState();
     } catch (e) {
-      state = NodeCreateOrEditViewModelFailure(e.toString());
+      state = FailureState(e.toString());
     }
   }
 }
diff --git a/lib/view_model/node_list/node_create_or_edit_view_model_state.dart b/lib/view_model/node_list/node_create_or_edit_view_model_state.dart
deleted file mode 100644
index 811b8bf8e..000000000
--- a/lib/view_model/node_list/node_create_or_edit_view_model_state.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-abstract class NodeCreateOrEditViewModelState {}
-
-class InitialNodeCreateOrEditViewModelState
-    extends NodeCreateOrEditViewModelState {}
-
-class NodeIsCreating extends NodeCreateOrEditViewModelState {}
-
-class NodeCreatedSuccessfully extends NodeCreateOrEditViewModelState {}
-
-class NodeCreateOrEditViewModelFailure extends NodeCreateOrEditViewModelState {
-  NodeCreateOrEditViewModelFailure(this.error);
-
-  final String error;
-}
diff --git a/lib/view_model/node_list/node_list_view_model.dart b/lib/view_model/node_list/node_list_view_model.dart
index 2807443b1..66b7e446c 100644
--- a/lib/view_model/node_list/node_list_view_model.dart
+++ b/lib/view_model/node_list/node_list_view_model.dart
@@ -1,12 +1,12 @@
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/node_list.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/node_list.dart';
 import 'package:cake_wallet/store/node_list_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cake_wallet/src/domain/common/default_settings_migration.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/default_settings_migration.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/utils/mobx.dart';
 import 'package:cake_wallet/utils/item_cell.dart';
 
diff --git a/lib/view_model/rescan_view_model.dart b/lib/view_model/rescan_view_model.dart
new file mode 100644
index 000000000..54df6af1a
--- /dev/null
+++ b/lib/view_model/rescan_view_model.dart
@@ -0,0 +1,25 @@
+import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:mobx/mobx.dart';
+
+part 'rescan_view_model.g.dart';
+
+class RescanViewModel = RescanViewModelBase with _$RescanViewModel;
+
+enum RescanWalletState { rescaning, none }
+
+abstract class RescanViewModelBase with Store {
+  RescanViewModelBase(this._wallet) {
+    state = RescanWalletState.none;
+  }
+
+  @observable
+  RescanWalletState state;
+  final WalletBase _wallet;
+
+  @action
+  Future<void> rescanCurrentWallet({int restoreHeight}) async {
+    state = RescanWalletState.rescaning;
+    await _wallet.rescan(height: restoreHeight);
+    state = RescanWalletState.none;
+  }
+}
\ No newline at end of file
diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
index b03ca02d1..a664690de 100644
--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@@ -1,23 +1,26 @@
 import 'package:intl/intl.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/core/template_validator.dart';
-import 'package:cake_wallet/src/domain/common/calculate_fiat_amount.dart';
-import 'package:cake_wallet/store/dashboard/fiat_convertation_store.dart';
 import 'package:cake_wallet/core/address_validator.dart';
 import 'package:cake_wallet/core/amount_validator.dart';
 import 'package:cake_wallet/core/pending_transaction.dart';
 import 'package:cake_wallet/core/validator.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet.dart';
+import 'package:cake_wallet/bitcoin/bitcoin_transaction_credentials.dart';
 import 'package:cake_wallet/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/monero/monero_transaction_creation_credentials.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
+import 'package:cake_wallet/entities/calculate_fiat_amount.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/view_model/send/send_view_model_state.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/bitcoin/bitcoin_transaction_credentials.dart';
+import 'package:cake_wallet/generated/i18n.dart';
 
 part 'send_view_model.g.dart';
 
@@ -26,13 +29,14 @@ class SendViewModel = SendViewModelBase with _$SendViewModel;
 abstract class SendViewModelBase with Store {
   SendViewModelBase(
       this._wallet, this._settingsStore, this._fiatConversationStore)
-      : state = InitialSendViewModelState(),
-        _cryptoNumberFormat = NumberFormat()..maximumFractionDigits = 12,
-        // FIXME: need to be based on wallet type.
-        sendAll = false;
+      : state = InitialExecutionState(),
+        _cryptoNumberFormat = NumberFormat(),
+        sendAll = false {
+    _setCryptoNumMaximumFractionDigits();
+  }
 
   @observable
-  SendViewModelState state;
+  ExecutionState state;
 
   @observable
   String fiatAmount;
@@ -82,7 +86,7 @@ abstract class SendViewModelBase with Store {
 
   final WalletBase _wallet;
   final SettingsStore _settingsStore;
-  final FiatConvertationStore _fiatConversationStore;
+  final FiatConversionStore _fiatConversationStore;
   final NumberFormat _cryptoNumberFormat;
 
   @action
@@ -98,11 +102,11 @@ abstract class SendViewModelBase with Store {
   @action
   Future<void> createTransaction() async {
     try {
-      state = TransactionIsCreating();
+      state = IsExecutingState();
       pendingTransaction = await _wallet.createTransaction(_credentials());
-      state = TransactionCreatedSuccessfully();
+      state = ExecutedSuccessfullyState();
     } catch (e) {
-      state = SendingFailed(error: e.toString());
+      state = FailureState(e.toString());
     }
   }
 
@@ -113,14 +117,13 @@ abstract class SendViewModelBase with Store {
       await pendingTransaction.commit();
       state = TransactionCommitted();
     } catch (e) {
-      state = SendingFailed(error: e.toString());
+      state = FailureState(e.toString());
     }
   }
 
   @action
   void setCryptoAmount(String amount) {
-    // FIXME: hardcoded value.
-    if (amount.toUpperCase() != 'ALL') {
+    if (amount.toUpperCase() != S.current.all) {
       sendAll = false;
     }
 
@@ -164,19 +167,41 @@ abstract class SendViewModelBase with Store {
   }
 
   Object _credentials() {
-    final amount =
-        !sendAll ? double.parse(cryptoAmount.replaceAll(',', '.')) : null;
+    final _amount = cryptoAmount.replaceAll(',', '.');
 
     switch (_wallet.type) {
       case WalletType.bitcoin:
+        final amount = !sendAll ? double.parse(_amount) : null;
+
         return BitcoinTransactionCredentials(
             address, amount, _settingsStore.transactionPriority);
       case WalletType.monero:
-        // FIXME: Wrong credentials
-        return BitcoinTransactionCredentials(
-            address, amount, _settingsStore.transactionPriority);
+        final amount = !sendAll ? _amount : null;
+
+        return MoneroTransactionCreationCredentials(
+            address: address,
+            paymentId: '',
+            priority: _settingsStore.transactionPriority,
+            amount: amount);
       default:
         return null;
     }
   }
+
+  void _setCryptoNumMaximumFractionDigits() {
+    var maximumFractionDigits = 0;
+
+    switch (_wallet.type) {
+      case WalletType.monero:
+        maximumFractionDigits = 12;
+        break;
+      case WalletType.bitcoin:
+        maximumFractionDigits = 8;
+        break;
+      default:
+        break;
+    }
+
+    _cryptoNumberFormat.maximumFractionDigits = maximumFractionDigits;
+  }
 }
diff --git a/lib/view_model/send/send_view_model_state.dart b/lib/view_model/send/send_view_model_state.dart
index b43e95378..6d63eb9c2 100644
--- a/lib/view_model/send/send_view_model_state.dart
+++ b/lib/view_model/send/send_view_model_state.dart
@@ -1,18 +1,4 @@
-import 'package:flutter/foundation.dart';
+import 'package:cake_wallet/core/execution_state.dart';
 
-abstract class SendViewModelState {}
-
-class InitialSendViewModelState extends SendViewModelState {}
-
-class TransactionIsCreating extends SendViewModelState {}
-class TransactionCreatedSuccessfully extends SendViewModelState {}
-
-class TransactionCommitting extends SendViewModelState {}
-
-class TransactionCommitted extends SendViewModelState {}
-
-class SendingFailed extends SendViewModelState {
-  SendingFailed({@required this.error});
-
-  String error;
-}
\ No newline at end of file
+class TransactionCommitting extends ExecutionState {}
+class TransactionCommitted extends ExecutionState {}
diff --git a/lib/view_model/send_view_model.dart b/lib/view_model/send_view_model.dart
deleted file mode 100644
index 5c06ad9c4..000000000
--- a/lib/view_model/send_view_model.dart
+++ /dev/null
@@ -1,216 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:intl/intl.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/core/address_validator.dart';
-import 'package:cake_wallet/core/amount_validator.dart';
-import 'package:cake_wallet/core/template_validator.dart';
-import 'package:cake_wallet/core/validator.dart';
-import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/bitcoin/bitcoin_wallet.dart';
-import 'package:cake_wallet/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/calculate_estimated_fee.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
-import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cake_wallet/store/templates/send_template_store.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/openalias_record.dart';
-import 'package:cake_wallet/store/dashboard/fiat_convertation_store.dart';
-import 'package:cake_wallet/src/domain/common/template.dart';
-
-part 'send_view_model.g.dart';
-
-abstract class SendViewModelState {}
-
-class InitialSendViewModelState extends SendViewModelState {}
-
-class TransactionIsCreating extends SendViewModelState {}
-
-class TransactionCreatedSuccessfully extends SendViewModelState {}
-
-class TransactionCommitting extends SendViewModelState {}
-
-class TransactionCommitted extends SendViewModelState {}
-
-class SendingFailed extends SendViewModelState {
-  SendingFailed({@required this.error});
-
-  String error;
-}
-
-class SendViewModel = SendViewModelBase with _$SendViewModel;
-
-abstract class SendViewModelBase with Store {
-  SendViewModelBase(this._wallet, this._settingsStore,
-      this._fiatConvertationStore, this.sendTemplateStore) {
-    state = InitialSendViewModelState();
-
-    _cryptoNumberFormat = NumberFormat()..maximumFractionDigits = 12;
-    _fiatNumberFormat = NumberFormat()..maximumFractionDigits = 2;
-  }
-
-  NumberFormat _cryptoNumberFormat;
-  NumberFormat _fiatNumberFormat;
-
-  @observable
-  SendViewModelState state;
-
-  @observable
-  String fiatAmount;
-
-  @observable
-  String cryptoAmount;
-
-  @observable
-  String address;
-
-  String get cryptoCurrencyTitle {
-    var _currencyTitle = '';
-
-    if (_wallet is MoneroWallet) {
-      _currencyTitle = 'Monero';
-    }
-
-    if (_wallet is BitcoinWallet) {
-      _currencyTitle = 'Bitcoin';
-    }
-
-    return _currencyTitle;
-  }
-
-  String get pageTitle => S.current.send_title + ' ' + cryptoCurrencyTitle;
-
-  FiatCurrency get fiat => _settingsStore.fiatCurrency;
-
-  TransactionPriority get transactionPriority =>
-      _settingsStore.transactionPriority;
-
-  double get estimatedFee =>
-      calculateEstimatedFee(priority: transactionPriority);
-
-  String get name => _wallet.name;
-
-  CryptoCurrency get currency => _wallet.currency;
-
-  Validator get amountValidator => AmountValidator(type: _wallet.type);
-
-  Validator get addressValidator => AddressValidator(type: _wallet.currency);
-
-  Validator get templateValidator => TemplateValidator();
-
-  @computed
-  double get price => _fiatConvertationStore.price;
-
-  @computed
-  ObservableList<Template> get templates =>
-      ObservableList.of(sendTemplateStore.templates
-          .where((item) => item.cryptoCurrency == _wallet.currency.title)
-          .toList());
-
-  @computed
-  String get balance {
-    var _balance = '0.0';
-
-    if (_wallet is MoneroWallet) {
-      _balance = _wallet.balance.formattedUnlockedBalance.toString();
-    }
-
-    if (_wallet is BitcoinWallet) {
-      _balance = _wallet.balance.confirmedFormatted.toString();
-    }
-
-    return _settingsStore.balanceDisplayMode == BalanceDisplayMode.hiddenBalance
-        ? '---'
-        : _balance;
-  }
-
-  @computed
-  SyncStatus get status => _wallet.syncStatus;
-
-  @action
-  void changeCryptoAmount(String amount) {
-    cryptoAmount = amount;
-
-    if (cryptoAmount != null && cryptoAmount.isNotEmpty) {
-      _calculateFiatAmount();
-    } else {
-      fiatAmount = '';
-    }
-  }
-
-  @action
-  void changeFiatAmount(String amount) {
-    fiatAmount = amount;
-
-    if (fiatAmount != null && fiatAmount.isNotEmpty) {
-      _calculateCryptoAmount();
-    } else {
-      cryptoAmount = '';
-    }
-  }
-
-  @action
-  Future _calculateFiatAmount() async {
-    try {
-      final amount = double.parse(cryptoAmount) * price;
-      fiatAmount = _fiatNumberFormat.format(amount);
-    } catch (e) {
-      fiatAmount = '0.00';
-    }
-  }
-
-  @action
-  Future _calculateCryptoAmount() async {
-    try {
-      final amount = double.parse(fiatAmount) / price;
-      cryptoAmount = _cryptoNumberFormat.format(amount);
-    } catch (e) {
-      cryptoAmount = '0.00';
-    }
-  }
-
-  @action
-  void changeAddress(String address) {
-    this.address = address;
-  }
-
-  @action
-  void setSendAll() {
-    cryptoAmount = 'ALL';
-    fiatAmount = '';
-  }
-
-  @action
-  void setTransactionPriority(TransactionPriority transactionPriority) {
-    _settingsStore.transactionPriority = transactionPriority;
-  }
-
-  final WalletBase _wallet;
-
-  final SettingsStore _settingsStore;
-
-  final FiatConvertationStore _fiatConvertationStore;
-
-  final SendTemplateStore sendTemplateStore;
-
-  String recordName;
-
-  String recordAddress;
-
-  Future<bool> isOpenaliasRecord(String name) async {
-    final _openaliasRecord = await OpenaliasRecord.fetchAddressAndName(
-        OpenaliasRecord.formatDomainName(name));
-
-    recordAddress = _openaliasRecord.address;
-    recordName = _openaliasRecord.name;
-
-    return recordAddress != name;
-  }
-
-  Future<void> createTransaction() async {}
-
-  Future<void> commitTransaction() async {}
-}
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index ab6e68a09..61ffda19b 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/src/domain/common/biometric_auth.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/biometric_auth.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/store/theme_changer_store.dart';
 import 'package:cake_wallet/themes.dart';
@@ -10,11 +10,11 @@ import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
-import 'package:cake_wallet/src/stores/action_list/action_list_display_mode.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
+import 'package:cake_wallet/entities/action_list_display_mode.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 import 'package:cake_wallet/view_model/settings/link_list_item.dart';
 import 'package:cake_wallet/view_model/settings/picker_list_item.dart';
diff --git a/lib/view_model/setup_pin_code_view_model.dart b/lib/view_model/setup_pin_code_view_model.dart
new file mode 100644
index 000000000..ad503b7dc
--- /dev/null
+++ b/lib/view_model/setup_pin_code_view_model.dart
@@ -0,0 +1,70 @@
+import 'package:cake_wallet/core/auth_service.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+
+class SetupPinCodeViewModel {
+  SetupPinCodeViewModel(this._authService, this._settingsStore)
+      : _pinCodeLength = _settingsStore.pinCodeLength;
+
+  String originalPinCode = '';
+
+  String repeatedPinCode = '';
+
+  set pinCode(String pinCode) {
+    if (!isOriginalPinCodeFull) {
+      setOriginalPinCode(pinCode);
+      return;
+    }
+
+    repeatedPinCode = pinCode;
+  }
+
+  int get pinCodeLength => _pinCodeLength;
+
+  set pinCodeLength(int length) {
+    _pinCodeLength = length;
+    reset();
+  }
+
+  bool get isOriginalPinCodeFull => originalPinCode.length == pinCodeLength;
+
+  bool get isRepeatedPinCodeFull => repeatedPinCode.length == pinCodeLength;
+
+  bool get isPinCodeCorrect =>
+      originalPinCode.length == pinCodeLength &&
+      repeatedPinCode.length == pinCodeLength &&
+      originalPinCode == repeatedPinCode;
+
+  final SettingsStore _settingsStore;
+  final AuthService _authService;
+  int _pinCodeLength;
+
+  void setOriginalPinCode(String pinCode) {
+    if (isOriginalPinCodeFull) {
+      return;
+    }
+
+    originalPinCode = pinCode;
+  }
+
+  void setRepeatedPinCode(String pinCode) {
+    if (isRepeatedPinCodeFull) {
+      return;
+    }
+
+    repeatedPinCode = pinCode;
+  }
+
+  void reset() {
+    originalPinCode = '';
+    repeatedPinCode = '';
+  }
+
+  Future<void> setupPinCode() async {
+    if (!isPinCodeCorrect) {
+      return;
+    }
+
+    await _authService.setPassword(repeatedPinCode);
+    _settingsStore.pinCodeLength = pinCodeLength;
+  }
+}
diff --git a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
index 978c7a819..382083361 100644
--- a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
+++ b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
@@ -7,7 +7,7 @@ import 'package:cake_wallet/utils/list_item.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_account_list_header.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_header.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_item.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 part 'wallet_address_list_view_model.g.dart';
 
diff --git a/lib/view_model/wallet_creation_state.dart b/lib/view_model/wallet_creation_state.dart
deleted file mode 100644
index 0d0d8ab88..000000000
--- a/lib/view_model/wallet_creation_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'package:flutter/foundation.dart';
-
-abstract class WalletCreationState {}
-
-class InitialWalletCreationState extends WalletCreationState {}
-
-class WalletCreating extends WalletCreationState {}
-
-class WalletCreatedSuccessfully extends WalletCreationState {}
-
-class WalletCreationFailure extends WalletCreationState {
-  WalletCreationFailure({@required this.error});
-
-  final String error;
-}
diff --git a/lib/view_model/wallet_creation_vm.dart b/lib/view_model/wallet_creation_vm.dart
index be5ae1ec4..dce3ecc00 100644
--- a/lib/view_model/wallet_creation_vm.dart
+++ b/lib/view_model/wallet_creation_vm.dart
@@ -1,20 +1,22 @@
-import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/core/wallet_credentials.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/view_model/wallet_creation_state.dart';
+import 'package:cake_wallet/entities/pathForWallet.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/store/app_store.dart';
 
 part 'wallet_creation_vm.g.dart';
 
 class WalletCreationVM = WalletCreationVMBase with _$WalletCreationVM;
 
 abstract class WalletCreationVMBase with Store {
-  WalletCreationVMBase(this._walletInfoSource,
+  WalletCreationVMBase(this._appStore, this._walletInfoSource,
       {@required this.type, @required this.isRecovery}) {
-    state = InitialWalletCreationState();
+    state = InitialExecutionState();
     name = '';
   }
 
@@ -22,17 +24,18 @@ abstract class WalletCreationVMBase with Store {
   String name;
 
   @observable
-  WalletCreationState state;
+  ExecutionState state;
 
   final WalletType type;
-
   final bool isRecovery;
-
   final Box<WalletInfo> _walletInfoSource;
+  final AppStore _appStore;
 
   Future<void> create({dynamic options}) async {
     try {
-      state = WalletCreating();
+      state = IsExecutingState();
+      final dirPath = await pathForWalletDir(name: name, type: type);
+      final path = await pathForWallet(name: name, type: type);
       final credentials = getCredentials(options);
       final walletInfo = WalletInfo.external(
           id: WalletBase.idFor(name, type),
@@ -40,19 +43,23 @@ abstract class WalletCreationVMBase with Store {
           type: type,
           isRecovery: isRecovery,
           restoreHeight: credentials.height ?? 0,
-          date: DateTime.now());
+          date: DateTime.now(),
+          path: path,
+          dirPath: dirPath);
       credentials.walletInfo = walletInfo;
-      await process(credentials);
+      final wallet = await process(credentials);
       await _walletInfoSource.add(walletInfo);
-      state = WalletCreatedSuccessfully();
+      _appStore.wallet = wallet;
+      _appStore.authenticationStore.allowed();
+      state = ExecutedSuccessfullyState();
     } catch (e) {
-      state = WalletCreationFailure(error: e.toString());
+      state = FailureState(e.toString());
     }
   }
 
   WalletCredentials getCredentials(dynamic options) =>
       throw UnimplementedError();
 
-  Future<void> process(WalletCredentials credentials) =>
+  Future<WalletBase> process(WalletCredentials credentials) =>
       throw UnimplementedError();
 }
diff --git a/lib/view_model/wallet_list/wallet_list_item.dart b/lib/view_model/wallet_list/wallet_list_item.dart
index 5e2210c7a..7ec452430 100644
--- a/lib/view_model/wallet_list/wallet_list_item.dart
+++ b/lib/view_model/wallet_list/wallet_list_item.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 
 class WalletListItem {
   const WalletListItem(
diff --git a/lib/view_model/wallet_list/wallet_list_view_model.dart b/lib/view_model/wallet_list/wallet_list_view_model.dart
index aa131ef0b..0e17a5e69 100644
--- a/lib/view_model/wallet_list/wallet_list_view_model.dart
+++ b/lib/view_model/wallet_list/wallet_list_view_model.dart
@@ -5,7 +5,7 @@ import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/core/wallet_service.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 
 part 'wallet_list_view_model.g.dart';
 
diff --git a/lib/view_model/wallet_new_vm.dart b/lib/view_model/wallet_new_vm.dart
index feccb0848..5ebf05f1b 100644
--- a/lib/view_model/wallet_new_vm.dart
+++ b/lib/view_model/wallet_new_vm.dart
@@ -3,10 +3,12 @@ import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/monero/monero_wallet_service.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_creation_credentials.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/core/wallet_creation_service.dart';
 import 'package:cake_wallet/core/wallet_credentials.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/view_model/wallet_creation_vm.dart';
 
 part 'wallet_new_vm.g.dart';
@@ -14,9 +16,11 @@ part 'wallet_new_vm.g.dart';
 class WalletNewVM = WalletNewVMBase with _$WalletNewVM;
 
 abstract class WalletNewVMBase extends WalletCreationVM with Store {
-  WalletNewVMBase(this._walletCreationService, Box<WalletInfo> walletInfoSource, {@required WalletType type})
+  WalletNewVMBase(AppStore appStore, this._walletCreationService,
+      Box<WalletInfo> walletInfoSource,
+      {@required WalletType type})
       : selectedMnemonicLanguage = '',
-        super(walletInfoSource, type: type, isRecovery: false);
+        super(appStore, walletInfoSource, type: type, isRecovery: false);
 
   @observable
   String selectedMnemonicLanguage;
@@ -39,6 +43,6 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
   }
 
   @override
-  Future<void> process(WalletCredentials credentials) async =>
+  Future<WalletBase> process(WalletCredentials credentials) async =>
       _walletCreationService.create(credentials);
 }
diff --git a/lib/view_model/wallet_restoration_from_keys_vm.dart b/lib/view_model/wallet_restoration_from_keys_vm.dart
index e0e0114c6..c3a2a9875 100644
--- a/lib/view_model/wallet_restoration_from_keys_vm.dart
+++ b/lib/view_model/wallet_restoration_from_keys_vm.dart
@@ -3,12 +3,14 @@ import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/monero/monero_wallet_service.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_creation_credentials.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/core/generate_wallet_password.dart';
 import 'package:cake_wallet/core/wallet_creation_service.dart';
 import 'package:cake_wallet/core/wallet_credentials.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/view_model/wallet_creation_vm.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 
 part 'wallet_restoration_from_keys_vm.g.dart';
 
@@ -17,9 +19,10 @@ class WalletRestorationFromKeysVM = WalletRestorationFromKeysVMBase
 
 abstract class WalletRestorationFromKeysVMBase extends WalletCreationVM
     with Store {
-  WalletRestorationFromKeysVMBase(this._walletCreationService, Box<WalletInfo> walletInfoSource,
+  WalletRestorationFromKeysVMBase(AppStore appStore,
+      this._walletCreationService, Box<WalletInfo> walletInfoSource,
       {@required WalletType type, @required this.language})
-      : super(walletInfoSource, type: type, isRecovery: true);
+      : super(appStore, walletInfoSource, type: type, isRecovery: true);
 
   @observable
   int height;
@@ -48,17 +51,22 @@ abstract class WalletRestorationFromKeysVMBase extends WalletCreationVM
     switch (type) {
       case WalletType.monero:
         return MoneroRestoreWalletFromKeysCredentials(
-          name: name, password: password, language: language, address: address,
-            viewKey: viewKey, spendKey: spendKey, height: height);
+            name: name,
+            password: password,
+            language: language,
+            address: address,
+            viewKey: viewKey,
+            spendKey: spendKey,
+            height: height);
       case WalletType.bitcoin:
         return BitcoinRestoreWalletFromWIFCredentials(
-          name: name, password: password, wif: wif);
+            name: name, password: password, wif: wif);
       default:
         return null;
     }
   }
 
   @override
-  Future<void> process(WalletCredentials credentials) async =>
+  Future<WalletBase> process(WalletCredentials credentials) async =>
       _walletCreationService.restoreFromKeys(credentials);
 }
diff --git a/lib/view_model/wallet_restoration_from_seed_vm.dart b/lib/view_model/wallet_restoration_from_seed_vm.dart
index ac9495bbb..09e779ea5 100644
--- a/lib/view_model/wallet_restoration_from_seed_vm.dart
+++ b/lib/view_model/wallet_restoration_from_seed_vm.dart
@@ -2,13 +2,15 @@ import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/monero/monero_wallet_service.dart';
+import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_creation_credentials.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/core/generate_wallet_password.dart';
 import 'package:cake_wallet/core/wallet_creation_service.dart';
 import 'package:cake_wallet/core/wallet_credentials.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/view_model/wallet_creation_vm.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 
 part 'wallet_restoration_from_seed_vm.g.dart';
 
@@ -17,9 +19,10 @@ class WalletRestorationFromSeedVM = WalletRestorationFromSeedVMBase
 
 abstract class WalletRestorationFromSeedVMBase extends WalletCreationVM
     with Store {
-  WalletRestorationFromSeedVMBase(this._walletCreationService, Box<WalletInfo> walletInfoSource,
+  WalletRestorationFromSeedVMBase(AppStore appStore,
+      this._walletCreationService, Box<WalletInfo> walletInfoSource,
       {@required WalletType type, @required this.language, this.seed})
-      : super(walletInfoSource, type: type, isRecovery: true);
+      : super(appStore, walletInfoSource, type: type, isRecovery: true);
 
   @observable
   String seed;
@@ -49,6 +52,6 @@ abstract class WalletRestorationFromSeedVMBase extends WalletCreationVM
   }
 
   @override
-  Future<void> process(WalletCredentials credentials) async =>
+  Future<WalletBase> process(WalletCredentials credentials) async =>
       _walletCreationService.restoreFromSeed(credentials);
 }
diff --git a/pubspec.lock b/pubspec.lock
index 5a5940ce8..5726e80b4 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -9,7 +9,7 @@ packages:
     source: hosted
     version: "6.0.0"
   analyzer:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
@@ -231,7 +231,7 @@ packages:
       name: connectivity_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0+4"
+    version: "0.1.0+5"
   connectivity_platform_interface:
     dependency: transitive
     description:
@@ -252,7 +252,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   csslib:
     dependency: transitive
     description:
@@ -280,7 +280,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.9"
+    version: "1.3.6"
   dartx:
     dependency: "direct overridden"
     description:
@@ -322,7 +322,7 @@ packages:
       name: encrypt
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.3"
   esys_flutter_share:
     dependency: "direct main"
     description:
@@ -395,14 +395,14 @@ packages:
       name: flutter_plugin_android_lifecycle
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.8"
+    version: "1.0.9"
   flutter_secure_storage:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.3"
+    version: "3.3.4"
   flutter_slidable:
     dependency: "direct main"
     description:
@@ -503,7 +503,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.12"
+    version: "2.1.17"
   intl:
     dependency: "direct main"
     description:
@@ -643,7 +643,7 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.14"
+    version: "1.6.16"
   path_provider_linux:
     dependency: transitive
     description:
@@ -657,7 +657,7 @@ packages:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4+3"
+    version: "0.0.4+4"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -665,6 +665,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.3"
   pedantic:
     dependency: "direct dev"
     description:
@@ -678,7 +685,7 @@ packages:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.0"
+    version: "3.0.4"
   platform:
     dependency: transitive
     description:
@@ -776,7 +783,7 @@ packages:
       name: share
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.5+1"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -844,7 +851,7 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.4+4"
+    version: "0.9.6"
   source_span:
     dependency: transitive
     description:
@@ -921,7 +928,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.5.1"
+    version: "5.6.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -935,7 +942,7 @@ packages:
       name: url_launcher_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.1+7"
+    version: "0.0.1+8"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -949,7 +956,14 @@ packages:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.3+2"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+1"
   uuid:
     dependency: "direct main"
     description:
@@ -978,6 +992,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.7.3"
   xdg_directories:
     dependency: transitive
     description:
@@ -991,7 +1012,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.6.1"
+    version: "4.5.1"
   yaml:
     dependency: "direct main"
     description:
@@ -1001,4 +1022,4 @@ packages:
     version: "2.2.1"
 sdks:
   dart: ">=2.9.0-14.0.dev <3.0.0"
-  flutter: ">=1.12.13+hotfix.5 <2.0.0"
+  flutter: ">=1.20.0 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 425abb878..7dbc0a7e0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -75,7 +75,6 @@ dev_dependencies:
 # Fix for hive  https://github.com/hivedb/hive/issues/247#issuecomment-606838497
 dependency_overrides:
   dartx: ^0.5.0
-  analyzer: 0.39.14
 
 flutter_icons:
   image_path: "assets/images/app_logo.png"
@@ -148,4 +147,4 @@ flutter:
   #         weight: 700
   #
   # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
+  # see https://flutter.dev/custom-fonts/#from-packages
\ No newline at end of file