diff --git a/wallet_app/android/app/src/main/AndroidManifest.xml b/wallet_app/android/app/src/main/AndroidManifest.xml
index 03489b78..6c4f0e5f 100644
--- a/wallet_app/android/app/src/main/AndroidManifest.xml
+++ b/wallet_app/android/app/src/main/AndroidManifest.xml
@@ -25,14 +25,14 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SendActivity"
+            android:name=".ui.activity.SendActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
         <activity
-            android:name=".ReceiverActivity"
+            android:name=".ui.activity.ReceiverActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
-        <activity android:name=".AddTokenActivity"
+        <activity android:name=".ui.activity.AddTokenActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
@@ -40,14 +40,14 @@
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
-        <activity android:name=".AccountPasswordActivity"
+        <activity android:name=".ui.activity.AccountPasswordActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
-        <activity android:name=".RecoveryPhraseActivity"
+        <activity android:name=".ui.activity.RecoveryPhraseActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
 
-        <activity android:name=".WalletActivity"
+        <activity android:name=".ui.activity.WalletActivity"
             android:exported="true"
             android:theme="@style/Theme.Walletapp"/>
     </application>
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/StarknetClient.kt b/wallet_app/android/app/src/main/StarknetClient.kt
similarity index 100%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/StarknetClient.kt
rename to wallet_app/android/app/src/main/StarknetClient.kt
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/AccountPassword.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AccountPassword.kt
similarity index 99%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/AccountPassword.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AccountPassword.kt
index fab2d7c6..9325e1b2 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/AccountPassword.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AccountPassword.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp
+package com.example.walletapp.ui.activity
 
 import android.app.Activity
 import android.content.Intent
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/AddTokenActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AddTokenActivity.kt
similarity index 99%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/AddTokenActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AddTokenActivity.kt
index 64b435d0..f3ee47ab 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/AddTokenActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/AddTokenActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp
+package com.example.walletapp.ui.activity
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/MainActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/MainActivity.kt
similarity index 99%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/MainActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/MainActivity.kt
index 15ce801d..95ef1420 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/MainActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp
+package com.example.walletapp.ui.activity
 
 import StarknetClient
 import android.app.Activity
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/ReceiverActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/ReceiverActivity.kt
similarity index 98%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/ReceiverActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/ReceiverActivity.kt
index 6834b00a..e450f41e 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/ReceiverActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/ReceiverActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp
+package com.example.walletapp.ui.activity
 
 import android.content.ClipData
 import android.content.ClipboardManager
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/RecoveryPhraseActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/RecoveryPhraseActivity.kt
similarity index 99%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/RecoveryPhraseActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/RecoveryPhraseActivity.kt
index f403227b..80429387 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/RecoveryPhraseActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/RecoveryPhraseActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp
+package com.example.walletapp.ui.activity
 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/SendActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/SendActivity.kt
similarity index 99%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/SendActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/SendActivity.kt
index 9a205691..08579b89 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/SendActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/SendActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp
+package com.example.walletapp.ui.activity
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/WalletActivity.kt b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/WalletActivity.kt
similarity index 99%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/WalletActivity.kt
rename to wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/WalletActivity.kt
index 74d6621c..d8f8d3e7 100644
--- a/wallet_app/android/app/src/main/java/com/example/walletapp/WalletActivity.kt
+++ b/wallet_app/android/app/src/main/java/com/example/walletapp/ui/activity/WalletActivity.kt
@@ -1,4 +1,4 @@
-package com.example.walletapp
+package com.example.walletapp.ui.activity
 
 import StarknetClient
 import android.app.Activity
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/theme/Color.kt b/wallet_app/android/app/src/main/res/theme/Color.kt
similarity index 100%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/theme/Color.kt
rename to wallet_app/android/app/src/main/res/theme/Color.kt
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/theme/Theme.kt b/wallet_app/android/app/src/main/res/theme/Theme.kt
similarity index 100%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/theme/Theme.kt
rename to wallet_app/android/app/src/main/res/theme/Theme.kt
diff --git a/wallet_app/android/app/src/main/java/com/example/walletapp/theme/Type.kt b/wallet_app/android/app/src/main/res/theme/Type.kt
similarity index 100%
rename from wallet_app/android/app/src/main/java/com/example/walletapp/theme/Type.kt
rename to wallet_app/android/app/src/main/res/theme/Type.kt