diff --git a/android/Omnivore/app/src/main/AndroidManifest.xml b/android/Omnivore/app/src/main/AndroidManifest.xml
index ed213ee7f..bf65b39f7 100644
--- a/android/Omnivore/app/src/main/AndroidManifest.xml
+++ b/android/Omnivore/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
         </activity>
 
         <activity
-            android:name=".NewFlowActivity"
+            android:name=".ui.save.NewFlowActivity"
             android:exported="true"
             android:theme="@style/Theme.AppCompat.Translucent">
             <intent-filter>
@@ -38,26 +38,5 @@
                 <data android:mimeType="text/*" />
             </intent-filter>
         </activity>
-<!--
-        <activity
-            android:name=".SaveActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/pdf" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/*" />
-            </intent-filter>
-        </activity>
--->
     </application>
 </manifest>
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt
index fbdd52768..b17bcfde6 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt
@@ -1,16 +1,11 @@
 package app.omnivore.omnivore
 
 import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Context
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.activity.ComponentActivity
-import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -32,13 +27,10 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
-import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInAccount
-import com.google.android.gms.auth.api.signin.GoogleSignInClient
-import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import app.omnivore.omnivore.ui.auth.GoogleAuthButton
+import app.omnivore.omnivore.ui.auth.LoginViewModel
+import app.omnivore.omnivore.ui.main.ScreenMain
 import com.google.android.gms.common.GoogleApiAvailability
-import com.google.android.gms.common.GooglePlayServicesUtil.isGooglePlayServicesAvailable
-import com.google.android.gms.tasks.Task
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/screen/EmailLogin.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt
similarity index 87%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/screen/EmailLogin.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt
index 8d2784eb8..ef4c30c78 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/screen/EmailLogin.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt
@@ -1,7 +1,5 @@
-package app.omnivore.omnivore.screen
+package app.omnivore.omnivore.ui.auth
 
-import android.content.Intent
-import android.net.Uri
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -13,8 +11,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import app.omnivore.omnivore.EmailLoginView
-import app.omnivore.omnivore.LoginViewModel
-
 
 @Composable
 fun EmailLoginPage(viewModel: LoginViewModel, navController: NavHostController) {
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/GoogleAuth.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt
similarity index 94%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/GoogleAuth.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt
index ba8b9eae0..cd27ceb50 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/GoogleAuth.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleAuth.kt
@@ -1,16 +1,15 @@
-package app.omnivore.omnivore
+package app.omnivore.omnivore.ui.auth
 
 import android.app.Activity
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import app.omnivore.omnivore.R
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/GoogleSignInButton.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleSignInButton.kt
similarity index 98%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/GoogleSignInButton.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleSignInButton.kt
index e80f8c0ce..0a55344eb 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/GoogleSignInButton.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/GoogleSignInButton.kt
@@ -1,4 +1,4 @@
-package app.omnivore.omnivore
+package app.omnivore.omnivore.ui.auth
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.clickable
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/LoginViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
similarity index 96%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/LoginViewModel.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
index 14db1873b..202e38eda 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/LoginViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
@@ -1,13 +1,12 @@
-package app.omnivore.omnivore
+package app.omnivore.omnivore.ui.auth
 
 import android.content.ContentValues
 import android.util.Log
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.lifecycle.*
+import app.omnivore.omnivore.*
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/screen/SplashPage.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/SplashPage.kt
similarity index 83%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/screen/SplashPage.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/SplashPage.kt
index 8e79e6930..cb275fc52 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/screen/SplashPage.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/SplashPage.kt
@@ -1,15 +1,13 @@
-package app.omnivore.omnivore.screen
+package app.omnivore.omnivore.ui.auth
 
 import android.content.Intent
 import android.net.Uri
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -17,17 +15,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
-import androidx.core.content.ContextCompat.startActivity
-import androidx.lifecycle.viewModelScope
 import androidx.navigation.NavHostController
-import app.omnivore.omnivore.EmailLoginView
-import app.omnivore.omnivore.GoogleAuthButton
-import app.omnivore.omnivore.LoginViewModel
 import app.omnivore.omnivore.Routes
 import com.google.android.gms.common.GoogleApiAvailability
-import kotlinx.coroutines.launch
 
 @Composable
 fun SplashPage(viewModel: LoginViewModel, navController: NavHostController) {
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ScreenMain.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/main/ScreenMain.kt
similarity index 74%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/ScreenMain.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/main/ScreenMain.kt
index a2248f02e..cef82c262 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ScreenMain.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/main/ScreenMain.kt
@@ -1,11 +1,13 @@
-package app.omnivore.omnivore
+package app.omnivore.omnivore.ui.main
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import app.omnivore.omnivore.screen.EmailLoginPage
-import app.omnivore.omnivore.screen.SplashPage
+import app.omnivore.omnivore.Routes
+import app.omnivore.omnivore.ui.auth.EmailLoginPage
+import app.omnivore.omnivore.ui.auth.SplashPage
+import app.omnivore.omnivore.ui.auth.LoginViewModel
 
 @Composable
 fun ScreenMain(viewModel: LoginViewModel){
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/NewFlowActivity.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/NewFlowActivity.kt
similarity index 72%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/NewFlowActivity.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/NewFlowActivity.kt
index 0748fda0f..571a622f8 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/NewFlowActivity.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/NewFlowActivity.kt
@@ -1,6 +1,7 @@
-package app.omnivore.omnivore
+package app.omnivore.omnivore.ui.save
 
 import androidx.compose.material.ExperimentalMaterialApi
+import app.omnivore.omnivore.ui.save.SaveSheetActivity
 
 // Not sure why we need this class, but directly opening SaveSheetActivity
 // causes the app to crash.
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveContent.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/SaveContent.kt
similarity index 96%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveContent.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/SaveContent.kt
index 4a569178b..62a355061 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveContent.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/SaveContent.kt
@@ -8,9 +8,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.material.*
-import androidx.compose.material.MaterialTheme.colors
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.unit.dp
+import app.omnivore.omnivore.ui.save.SaveViewModel
 import kotlinx.coroutines.launch
 
 @Composable
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveSheetActivity.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/SaveSheetActivity.kt
similarity index 98%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveSheetActivity.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/SaveSheetActivity.kt
index 521e5c3df..4ffc0fcae 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveSheetActivity.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/SaveSheetActivity.kt
@@ -1,4 +1,4 @@
-package app.omnivore.omnivore
+package app.omnivore.omnivore.ui.save
 
 import android.content.ContentValues
 import android.content.Intent
@@ -18,6 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import app.omnivore.omnivore.SaveContent
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/SaveViewModel.kt
similarity index 92%
rename from android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveViewModel.kt
rename to android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/SaveViewModel.kt
index 1cbf43078..710554047 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/save/SaveViewModel.kt
@@ -1,4 +1,4 @@
-package app.omnivore.omnivore
+package app.omnivore.omnivore.ui.save
 
 import android.content.ContentValues
 import android.util.Log
@@ -7,6 +7,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import app.omnivore.omnivore.Constants
+import app.omnivore.omnivore.DatastoreKeys
+import app.omnivore.omnivore.DatastoreRepository
 import app.omnivore.omnivore.graphql.generated.SaveUrlMutation
 import app.omnivore.omnivore.graphql.generated.type.SaveUrlInput
 import com.apollographql.apollo3.ApolloClient