diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/WalletScreen.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/WalletScreen.kt
index a845200..38987af 100644
--- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/WalletScreen.kt
+++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/WalletScreen.kt
@@ -53,6 +53,8 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import com.bitcointxoko.gudariwallet.MainActivity
+import com.bitcointxoko.gudariwallet.ui.receive.ReceiveScreen
+import com.bitcointxoko.gudariwallet.ui.send.SendScreen
 import com.bitcointxoko.gudariwallet.util.SendInputType
 import kotlinx.coroutines.delay
 
@@ -265,15 +267,17 @@ fun WalletScreen(
                         }
                     )
                 }
-                composable(TabItem.Receive.route) { ReceiveScreen(
-                    vm,
-                    onNavigateToPaymentDetail = { checkingId ->
-                        navController.navigate("payment_detail/$checkingId")
-                    }
-                )}
+                composable(TabItem.Receive.route) {
+                    ReceiveScreen(
+                        vm,
+                        onNavigateToPaymentDetail = { checkingId ->
+                            navController.navigate("payment_detail/$checkingId")
+                        }
+                    )
+                }
                 composable(TabItem.Send.route) {
                     SendScreen(
-                        vm            = vm,
+                        vm = vm,
                         onViewDetails = { paymentHash ->
                             navController.navigate("payment_detail/$paymentHash") {
                                 launchSingleTop = true
diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/ReceiveScreen.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/ReceiveScreen.kt
similarity index 99%
rename from app/src/main/java/com/bitcointxoko/gudariwallet/ui/ReceiveScreen.kt
rename to app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/ReceiveScreen.kt
index b035741..ca1dade 100644
--- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/ReceiveScreen.kt
+++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/ReceiveScreen.kt
@@ -1,4 +1,4 @@
-package com.bitcointxoko.gudariwallet.ui
+package com.bitcointxoko.gudariwallet.ui.receive
 
 import android.app.Activity
 import android.view.WindowManager
@@ -52,9 +52,9 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.bitcointxoko.gudariwallet.ui.ReceiveState
+import com.bitcointxoko.gudariwallet.ui.WalletViewModel
 import com.bitcointxoko.gudariwallet.ui.components.UnitWheelPicker
-import com.bitcointxoko.gudariwallet.ui.receive.AmountDisplay
-import com.bitcointxoko.gudariwallet.ui.receive.QrDisplayCard
 import com.bitcointxoko.gudariwallet.util.fiatLabel
 import kotlinx.coroutines.delay
 
diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/SendScreen.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendScreen.kt
similarity index 97%
rename from app/src/main/java/com/bitcointxoko/gudariwallet/ui/SendScreen.kt
rename to app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendScreen.kt
index fe9594b..3d83dc1 100644
--- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/SendScreen.kt
+++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendScreen.kt
@@ -1,4 +1,4 @@
-package com.bitcointxoko.gudariwallet.ui
+package com.bitcointxoko.gudariwallet.ui.send
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
@@ -20,9 +20,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.bitcointxoko.gudariwallet.ui.send.Bolt11ConfirmCard
-import com.bitcointxoko.gudariwallet.ui.send.LnurlInvoiceConfirmCard
-import com.bitcointxoko.gudariwallet.ui.send.LnurlPayForm
+import com.bitcointxoko.gudariwallet.ui.BalanceState
+import com.bitcointxoko.gudariwallet.ui.SendState
+import com.bitcointxoko.gudariwallet.ui.WalletViewModel
 import com.bitcointxoko.gudariwallet.util.SendInputDetector
 import com.bitcointxoko.gudariwallet.util.feePpm
 import com.bitcointxoko.gudariwallet.util.formatFiat