diff --git a/lib/db/queries/queries.dart b/lib/db/queries/queries.dart
index d2b49cea8..c8bbe7385 100644
--- a/lib/db/queries/queries.dart
+++ b/lib/db/queries/queries.dart
@@ -8,7 +8,7 @@
  *
  */
 
-part of 'package:stackwallet/db/isar/main_db.dart';
+part of '../isar/main_db.dart';
 
 enum CCFilter {
   all,
diff --git a/lib/notifications/show_flush_bar.dart b/lib/notifications/show_flush_bar.dart
index 08aa5c063..b955a41ec 100644
--- a/lib/notifications/show_flush_bar.dart
+++ b/lib/notifications/show_flush_bar.dart
@@ -12,11 +12,12 @@ import 'package:another_flushbar/flushbar.dart';
 import 'package:another_flushbar/flushbar_route.dart' as flushRoute;
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
+
 import '../themes/stack_colors.dart';
 import '../utilities/constants.dart';
 import '../utilities/enums/flush_bar_type.dart';
 
-export 'package:stackwallet/utilities/enums/flush_bar_type.dart';
+export '../utilities/enums/flush_bar_type.dart';
 
 Future<dynamic> showFloatingFlushBar({
   required FlushBarType type,
diff --git a/lib/wallets/crypto_currency/crypto_currency.dart b/lib/wallets/crypto_currency/crypto_currency.dart
index f5f78fda9..7b30c85fe 100644
--- a/lib/wallets/crypto_currency/crypto_currency.dart
+++ b/lib/wallets/crypto_currency/crypto_currency.dart
@@ -2,26 +2,25 @@ import '../../models/isar/models/blockchain_data/address.dart';
 import '../../models/node_model.dart';
 import '../../utilities/enums/derive_path_type_enum.dart';
 
-export 'package:stackwallet/wallets/crypto_currency/coins/banano.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/bitcoin.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/bitcoin_frost.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/bitcoincash.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/dogecoin.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/ecash.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/epiccash.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/ethereum.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/firo.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/litecoin.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/monero.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/namecoin.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/nano.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/particl.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/peercoin.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/solana.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/stellar.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/tezos.dart';
-export 'package:stackwallet/wallets/crypto_currency/coins/wownero.dart';
-export 'package:stackwallet/wallets/crypto_currency/crypto_currency.dart';
+export 'coins/banano.dart';
+export 'coins/bitcoin.dart';
+export 'coins/bitcoin_frost.dart';
+export 'coins/bitcoincash.dart';
+export 'coins/dogecoin.dart';
+export 'coins/ecash.dart';
+export 'coins/epiccash.dart';
+export 'coins/ethereum.dart';
+export 'coins/firo.dart';
+export 'coins/litecoin.dart';
+export 'coins/monero.dart';
+export 'coins/namecoin.dart';
+export 'coins/nano.dart';
+export 'coins/particl.dart';
+export 'coins/peercoin.dart';
+export 'coins/solana.dart';
+export 'coins/stellar.dart';
+export 'coins/tezos.dart';
+export 'coins/wownero.dart';
 
 enum CryptoCurrencyNetwork {
   main,
diff --git a/lib/widgets/desktop/outline_blue_button.dart b/lib/widgets/desktop/outline_blue_button.dart
index b865b64e7..6073db347 100644
--- a/lib/widgets/desktop/outline_blue_button.dart
+++ b/lib/widgets/desktop/outline_blue_button.dart
@@ -9,12 +9,13 @@
  */
 
 import 'package:flutter/material.dart';
+
 import '../../themes/stack_colors.dart';
 import '../../utilities/text_styles.dart';
 import '../../utilities/util.dart';
 import 'custom_text_button.dart';
 
-export 'package:stackwallet/widgets/desktop/custom_text_button.dart';
+export 'custom_text_button.dart';
 
 class OutlineBlueButton extends StatelessWidget {
   const OutlineBlueButton({
diff --git a/lib/widgets/desktop/primary_button.dart b/lib/widgets/desktop/primary_button.dart
index 04f40e01c..e9d555700 100644
--- a/lib/widgets/desktop/primary_button.dart
+++ b/lib/widgets/desktop/primary_button.dart
@@ -9,12 +9,13 @@
  */
 
 import 'package:flutter/material.dart';
+
 import '../../themes/stack_colors.dart';
 import '../../utilities/text_styles.dart';
 import '../../utilities/util.dart';
 import 'custom_text_button.dart';
 
-export 'package:stackwallet/widgets/desktop/custom_text_button.dart';
+export 'custom_text_button.dart';
 
 class PrimaryButton extends StatelessWidget {
   const PrimaryButton({
diff --git a/lib/widgets/desktop/secondary_button.dart b/lib/widgets/desktop/secondary_button.dart
index 80824c8f8..eba9a59f3 100644
--- a/lib/widgets/desktop/secondary_button.dart
+++ b/lib/widgets/desktop/secondary_button.dart
@@ -9,12 +9,13 @@
  */
 
 import 'package:flutter/material.dart';
+
 import '../../themes/stack_colors.dart';
 import '../../utilities/text_styles.dart';
 import '../../utilities/util.dart';
 import 'custom_text_button.dart';
 
-export 'package:stackwallet/widgets/desktop/custom_text_button.dart';
+export 'custom_text_button.dart';
 
 class SecondaryButton extends StatelessWidget {
   const SecondaryButton({