diff --git a/app/src/main/java/org/fairscan/app/MainActivity.kt b/app/src/main/java/org/fairscan/app/MainActivity.kt
index b1021a3..64bc938 100644
--- a/app/src/main/java/org/fairscan/app/MainActivity.kt
+++ b/app/src/main/java/org/fairscan/app/MainActivity.kt
@@ -49,6 +49,7 @@ import kotlinx.coroutines.withContext
 import org.fairscan.app.data.GeneratedPdf
 import org.fairscan.app.ui.Navigation
 import org.fairscan.app.ui.Screen
+import org.fairscan.app.ui.components.rememberCameraPermissionState
 import org.fairscan.app.ui.theme.FairScanTheme
 import org.fairscan.app.ui.screens.AboutScreen
 import org.fairscan.app.ui.screens.camera.CameraScreen
diff --git a/app/src/main/java/org/fairscan/app/CameraPermission.kt b/app/src/main/java/org/fairscan/app/ui/components/CameraPermission.kt
similarity index 97%
rename from app/src/main/java/org/fairscan/app/CameraPermission.kt
rename to app/src/main/java/org/fairscan/app/ui/components/CameraPermission.kt
index a1f41c9..87c32ac 100644
--- a/app/src/main/java/org/fairscan/app/CameraPermission.kt
+++ b/app/src/main/java/org/fairscan/app/ui/components/CameraPermission.kt
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package org.fairscan.app
+package org.fairscan.app.ui.components
 
 import android.Manifest
 import android.content.Context
@@ -29,6 +29,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.ContextCompat
+import org.fairscan.app.R
 
 private fun hasCameraPermission(context: Context): Boolean {
     val camera = Manifest.permission.CAMERA
diff --git a/app/src/main/java/org/fairscan/app/ui/screens/HomeScreen.kt b/app/src/main/java/org/fairscan/app/ui/screens/HomeScreen.kt
index 8b2faeb..b2e1801 100644
--- a/app/src/main/java/org/fairscan/app/ui/screens/HomeScreen.kt
+++ b/app/src/main/java/org/fairscan/app/ui/screens/HomeScreen.kt
@@ -55,10 +55,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import kotlinx.collections.immutable.persistentListOf
-import org.fairscan.app.CameraPermissionState
+import org.fairscan.app.ui.components.CameraPermissionState
 import org.fairscan.app.ui.Navigation
 import org.fairscan.app.R
-import org.fairscan.app.rememberCameraPermissionState
+import org.fairscan.app.ui.components.rememberCameraPermissionState
 import org.fairscan.app.ui.state.RecentDocumentUiState
 import org.fairscan.app.ui.components.AboutScreenNavButton
 import org.fairscan.app.ui.components.formatDate
diff --git a/app/src/main/java/org/fairscan/app/ui/screens/camera/CameraPreview.kt b/app/src/main/java/org/fairscan/app/ui/screens/camera/CameraPreview.kt
index 83957dd..87f0baa 100644
--- a/app/src/main/java/org/fairscan/app/ui/screens/camera/CameraPreview.kt
+++ b/app/src/main/java/org/fairscan/app/ui/screens/camera/CameraPreview.kt
@@ -53,7 +53,7 @@ import androidx.core.graphics.scale
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.google.common.util.concurrent.ListenableFuture
-import org.fairscan.app.CameraPermissionState
+import org.fairscan.app.ui.components.CameraPermissionState
 import org.fairscan.app.ui.state.LiveAnalysisState
 import org.fairscan.app.domain.Point
 import org.fairscan.app.domain.scaledTo
diff --git a/app/src/main/java/org/fairscan/app/ui/screens/camera/CameraScreen.kt b/app/src/main/java/org/fairscan/app/ui/screens/camera/CameraScreen.kt
index 904756b..31efb9e 100644
--- a/app/src/main/java/org/fairscan/app/ui/screens/camera/CameraScreen.kt
+++ b/app/src/main/java/org/fairscan/app/ui/screens/camera/CameraScreen.kt
@@ -82,7 +82,7 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.delay
-import org.fairscan.app.CameraPermissionState
+import org.fairscan.app.ui.components.CameraPermissionState
 import org.fairscan.app.ui.state.LiveAnalysisState
 import org.fairscan.app.MainViewModel
 import org.fairscan.app.MainViewModel.CaptureState