diff --git a/.gitignore b/.gitignore
index c6c8aba7..1bf06862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,10 @@
 **/.DS_Store
 
 # mdBook
-docs/book/
\ No newline at end of file
+docs/book/
+
+**/.gradle/*
+
+lightclientservice/app/build
+lightclientservice/target
+lightclientservice/local.properties
diff --git a/wallet_app/android/.idea/other.xml b/wallet_app/android/.idea/other.xml
index 94c96f63..a76f1180 100644
--- a/wallet_app/android/.idea/other.xml
+++ b/wallet_app/android/.idea/other.xml
@@ -25,6 +25,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2160" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB370FU" />
+          <option name="id" value="TB370FU" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab P12" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1840" />
+          <option name="screenY" value="2944" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
diff --git a/wallet_app/android/app/src/main/AndroidManifest.xml b/wallet_app/android/app/src/main/AndroidManifest.xml
index 6c4f0e5f..086875c3 100644
--- a/wallet_app/android/app/src/main/AndroidManifest.xml
+++ b/wallet_app/android/app/src/main/AndroidManifest.xml
@@ -25,29 +25,29 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.activity.SendActivity"
+            android:name=".SendActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
         <activity
-            android:name=".ui.activity.ReceiverActivity"
+            android:name=".ReceiverActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
-        <activity android:name=".ui.activity.AddTokenActivity"
+        <activity android:name=".AddTokenActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
-        <activity android:name=".ui.activity.AccountBalanceActivity"
+        <activity android:name=".AccountBalanceActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
-        <activity android:name=".ui.activity.AccountPasswordActivity"
+        <activity android:name=".AccountPasswordActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
-        <activity android:name=".ui.activity.RecoveryPhraseActivity"
+        <activity android:name=".RecoveryPhraseActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
-        <activity android:name=".ui.activity.WalletActivity"
+        <activity android:name=".WalletActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
     </application>
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AccountBalanceActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/AccountBalanceActivity.kt
similarity index 92%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AccountBalanceActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/AccountBalanceActivity.kt
index dc960f1e..e45adf2c 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AccountBalanceActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/AccountBalanceActivity.kt
@@ -1,6 +1,5 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
-import StarknetClient
 import android.app.Activity
 import android.os.Bundle
 import android.util.Log
@@ -18,14 +17,12 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.TextField
 import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -39,21 +36,14 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.graphics.toColorInt
 import androidx.core.view.WindowCompat
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.example.walletapp.BuildConfig
 import com.example.walletapp.ui.theme.WalletappTheme
-import com.swmansion.starknet.data.types.Call
 import com.swmansion.starknet.data.types.Felt
-import com.swmansion.starknet.data.types.Uint256
 import com.swmansion.starknet.provider.exceptions.RpcRequestFailedException
-import com.swmansion.starknet.provider.rpc.JsonRpcProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.future.await
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.math.BigDecimal
-import java.math.RoundingMode
 
 
 class AccountBalanceActivity : ComponentActivity() {
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AccountPassword.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/AccountPassword.kt
similarity index 97%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AccountPassword.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/AccountPassword.kt
index 9325e1b2..3551ace7 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AccountPassword.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/AccountPassword.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
 import android.app.Activity
 import android.content.Intent
@@ -27,8 +27,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.unit.dp
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.sharp.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AddTokenActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/AddTokenActivity.kt
similarity index 99%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AddTokenActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/AddTokenActivity.kt
index f3ee47ab..64b435d0 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AddTokenActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/AddTokenActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/MainActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/MainActivity.kt
similarity index 98%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/MainActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/MainActivity.kt
index 95ef1420..b52dd6dd 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/MainActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/MainActivity.kt
@@ -1,6 +1,5 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
-import StarknetClient
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/ReceiverActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ReceiverActivity.kt
similarity index 98%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/ReceiverActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/ReceiverActivity.kt
index e450f41e..6834b00a 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/ReceiverActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ReceiverActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
 import android.content.ClipData
 import android.content.ClipboardManager
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/RecoveryPhraseActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/RecoveryPhraseActivity.kt
similarity index 99%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/RecoveryPhraseActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/RecoveryPhraseActivity.kt
index 80429387..f403227b 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/RecoveryPhraseActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/RecoveryPhraseActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/SendActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/SendActivity.kt
similarity index 99%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/SendActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/SendActivity.kt
index 08579b89..9a205691 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/SendActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/SendActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
diff --git a/wallet_app/android/app/src/main/StarknetClient.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/StarknetClient.kt
similarity index 96%
rename from wallet_app/android/app/src/main/StarknetClient.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/StarknetClient.kt
index efe38aea..13e22658 100644
--- a/wallet_app/android/app/src/main/StarknetClient.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/StarknetClient.kt
@@ -1,4 +1,5 @@
-import com.example.walletapp.BuildConfig
+package com.example.walletapp
+
 import com.swmansion.starknet.account.StandardAccount
 import com.swmansion.starknet.data.types.Call
 import com.swmansion.starknet.data.types.Felt
@@ -13,7 +14,7 @@ const val ETH_ERC20_ADDRESS = "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741
 class StarknetClient(private val rpcUrl: String) {
 
     private val provider = JsonRpcProvider(rpcUrl)
-    private val privateKey=BuildConfig.PRIVATE_KEY
+    private val privateKey= BuildConfig.PRIVATE_KEY
     private val accountAddress=BuildConfig.ACCOUNT_ADDRESS
 
     suspend fun deployAccount() {
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/WalletActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/WalletActivity.kt
similarity index 97%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/WalletActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/WalletActivity.kt
index 28f3b85a..3d6d1632 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/WalletActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/WalletActivity.kt
@@ -1,10 +1,8 @@
-package com.example.walletapp.ui.activity
+package com.example.walletapp
 
-import StarknetClient
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.service.quickaccesswallet.WalletCard
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -13,9 +11,6 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.hoverable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -27,7 +22,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
@@ -54,7 +48,6 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupProperties