diff --git a/src/app/auth/_layout.tsx b/src/app/auth/_layout.tsx
index ff3803ea..9d255f97 100644
--- a/src/app/auth/_layout.tsx
+++ b/src/app/auth/_layout.tsx
@@ -3,7 +3,6 @@ import { Stack } from 'expo-router';
 function StackLayout() {
   return (
     <Stack>
-      <Stack.Screen name="index" options={{ headerShown: false }} />
       <Stack.Screen name="signup" options={{ headerShown: false }} />
       <Stack.Screen name="login" options={{ headerShown: false }} />
       <Stack.Screen name="onboarding" options={{ headerShown: false }} />
diff --git a/src/app/auth/forgotPassword/_layout.tsx b/src/app/auth/forgotPassword/_layout.tsx
new file mode 100644
index 00000000..d021a461
--- /dev/null
+++ b/src/app/auth/forgotPassword/_layout.tsx
@@ -0,0 +1,11 @@
+import { Stack } from 'expo-router';
+
+function StackLayout() {
+  return (
+    <Stack>
+      <Stack.Screen name="index" options={{ headerShown: false }} />
+    </Stack>
+  );
+}
+
+export default StackLayout;
diff --git a/src/app/auth/forgotPassword.tsx b/src/app/auth/forgotPassword/index.tsx
similarity index 86%
rename from src/app/auth/forgotPassword.tsx
rename to src/app/auth/forgotPassword/index.tsx
index daed9252..ce73303d 100644
--- a/src/app/auth/forgotPassword.tsx
+++ b/src/app/auth/forgotPassword/index.tsx
@@ -1,10 +1,11 @@
 import { router } from 'expo-router';
 import React, { useState } from 'react';
-import { Alert, TextInput, View, StyleSheet } from 'react-native';
+import { Alert, TextInput, View } from 'react-native';
 import { Button, Input } from 'react-native-elements';
 
-import globalStyles from '../../styles/globalStyles';
-import { useSession } from '../../utils/AuthContext';
+import styles from './styles';
+import globalStyles from '../../../styles/globalStyles';
+import { useSession } from '../../../utils/AuthContext';
 
 function ForgotPasswordScreen() {
   const { updateUser, signOut, resetPassword, verifyOtp } = useSession();
@@ -115,23 +116,3 @@ function ForgotPasswordScreen() {
 }
 
 export default ForgotPasswordScreen;
-
-const styles = StyleSheet.create({
-  input: {
-    height: 40,
-    borderColor: 'gray',
-    borderWidth: 1,
-    marginTop: 10,
-    padding: 5,
-  },
-  verticallySpaced: {
-    paddingTop: 4,
-    paddingBottom: 4,
-    alignSelf: 'stretch',
-  },
-  container: {
-    paddingVertical: 63,
-    paddingLeft: 43,
-    paddingRight: 44,
-  },
-});
diff --git a/src/app/auth/forgotPassword/styles.tsx b/src/app/auth/forgotPassword/styles.tsx
new file mode 100644
index 00000000..daea4952
--- /dev/null
+++ b/src/app/auth/forgotPassword/styles.tsx
@@ -0,0 +1,21 @@
+import { StyleSheet } from 'react-native';
+
+export default StyleSheet.create({
+  input: {
+    height: 40,
+    borderColor: 'gray',
+    borderWidth: 1,
+    marginTop: 10,
+    padding: 5,
+  },
+  verticallySpaced: {
+    paddingTop: 4,
+    paddingBottom: 4,
+    alignSelf: 'stretch',
+  },
+  container: {
+    paddingVertical: 63,
+    paddingLeft: 43,
+    paddingRight: 44,
+  },
+});
diff --git a/src/app/auth/index.tsx b/src/app/auth/index.tsx
deleted file mode 100644
index 22156936..00000000
--- a/src/app/auth/index.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { router } from 'expo-router';
-import { Button, Text } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
-
-import globalStyles from '../../styles/globalStyles';
-
-function LoginScreen() {
-  return (
-    <SafeAreaView style={globalStyles.container}>
-      <Text style={globalStyles.h1}>Auth</Text>
-      <Button
-        title="Login"
-        onPress={() => router.replace('/auth/onboarding')}
-      />
-      <Button title="Sign Up" onPress={() => router.replace('/auth/signup')} />
-      <Button title="[temp] Home" onPress={() => router.push('/home')} />
-    </SafeAreaView>
-  );
-}
-
-export default LoginScreen;
diff --git a/src/app/auth/login/_layout.tsx b/src/app/auth/login/_layout.tsx
new file mode 100644
index 00000000..d021a461
--- /dev/null
+++ b/src/app/auth/login/_layout.tsx
@@ -0,0 +1,11 @@
+import { Stack } from 'expo-router';
+
+function StackLayout() {
+  return (
+    <Stack>
+      <Stack.Screen name="index" options={{ headerShown: false }} />
+    </Stack>
+  );
+}
+
+export default StackLayout;
diff --git a/src/app/auth/login.tsx b/src/app/auth/login/index.tsx
similarity index 77%
rename from src/app/auth/login.tsx
rename to src/app/auth/login/index.tsx
index 86d751d8..d57f289d 100644
--- a/src/app/auth/login.tsx
+++ b/src/app/auth/login/index.tsx
@@ -1,15 +1,16 @@
 import { Link, router } from 'expo-router';
 import React, { useState } from 'react';
-import { Text, View, StyleSheet } from 'react-native';
+import { Text, View } from 'react-native';
 import { Icon } from 'react-native-elements';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import validator from 'validator';
 
-import StyledButton from '../../components/StyledButton/StyledButton';
-import UserStringInput from '../../components/UserStringInput/UserStringInput';
-import { isEmailUsed, queryEmailByUsername } from '../../queries/auth';
-import globalStyles from '../../styles/globalStyles';
-import { useSession } from '../../utils/AuthContext';
+import styles from './styles';
+import { isEmailUsed, queryEmailByUsername } from '../../../queries/auth';
+import globalStyles from '../../../styles/globalStyles';
+import { useSession } from '../../../utils/AuthContext';
+import StyledButton from '../../../components/StyledButton/StyledButton';
+import UserStringInput from '../../../components/UserStringInput/UserStringInput';
 
 function LoginScreen() {
   const sessionHandler = useSession();
@@ -123,38 +124,3 @@ function LoginScreen() {
 }
 
 export default LoginScreen;
-
-const styles = StyleSheet.create({
-  flex: {
-    justifyContent: 'space-between',
-  },
-  forgotPassword: {
-    fontSize: 12,
-    textDecorationLine: 'underline',
-    paddingTop: 18,
-    paddingBottom: 16,
-    fontWeight: '400',
-  },
-  link: {
-    fontWeight: '700',
-    textDecorationLine: 'underline',
-  },
-  redirectText: {
-    textAlign: 'center',
-    marginTop: 16,
-    marginBottom: 64,
-  },
-  title: {
-    lineHeight: 33,
-    paddingTop: 64,
-    marginBottom: 28,
-    fontSize: 24,
-    fontWeight: '700',
-  },
-  error: {
-    color: 'red',
-  },
-  icon: {
-    paddingRight: 10,
-  },
-});
diff --git a/src/app/auth/login/styles.tsx b/src/app/auth/login/styles.tsx
new file mode 100644
index 00000000..644dc93d
--- /dev/null
+++ b/src/app/auth/login/styles.tsx
@@ -0,0 +1,36 @@
+import { StyleSheet } from 'react-native';
+
+export default StyleSheet.create({
+  flex: {
+    justifyContent: 'space-between',
+  },
+  forgotPassword: {
+    fontSize: 12,
+    textDecorationLine: 'underline',
+    paddingTop: 18,
+    paddingBottom: 16,
+    fontWeight: '400',
+  },
+  link: {
+    fontWeight: '700',
+    textDecorationLine: 'underline',
+  },
+  redirectText: {
+    textAlign: 'center',
+    marginTop: 16,
+    marginBottom: 64,
+  },
+  title: {
+    lineHeight: 33,
+    paddingTop: 64,
+    marginBottom: 28,
+    fontSize: 24,
+    fontWeight: '700',
+  },
+  error: {
+    color: 'red',
+  },
+  icon: {
+    paddingRight: 10,
+  },
+});
diff --git a/src/app/auth/onboarding/_layout.tsx b/src/app/auth/onboarding/_layout.tsx
new file mode 100644
index 00000000..d021a461
--- /dev/null
+++ b/src/app/auth/onboarding/_layout.tsx
@@ -0,0 +1,11 @@
+import { Stack } from 'expo-router';
+
+function StackLayout() {
+  return (
+    <Stack>
+      <Stack.Screen name="index" options={{ headerShown: false }} />
+    </Stack>
+  );
+}
+
+export default StackLayout;
diff --git a/src/app/auth/onboarding.tsx b/src/app/auth/onboarding/index.tsx
similarity index 87%
rename from src/app/auth/onboarding.tsx
rename to src/app/auth/onboarding/index.tsx
index e5376d21..06ac3761 100644
--- a/src/app/auth/onboarding.tsx
+++ b/src/app/auth/onboarding/index.tsx
@@ -1,13 +1,14 @@
 import DateTimePicker from '@react-native-community/datetimepicker';
 import { Redirect, router } from 'expo-router';
 import { useState, useEffect } from 'react';
-import { Alert, StyleSheet, ScrollView, Platform } from 'react-native';
+import { Alert, ScrollView, Platform } from 'react-native';
 import { Button } from 'react-native-elements';
 
-import StyledButton from '../../components/StyledButton/StyledButton';
-import UserStringInput from '../../components/UserStringInput/UserStringInput';
-import { useSession } from '../../utils/AuthContext';
-import supabase from '../../utils/supabase';
+import styles from './styles';
+import UserStringInput from '../../../components/UserStringInput/UserStringInput';
+import { useSession } from '../../../utils/AuthContext';
+import supabase from '../../../utils/supabase';
+import StyledButton from '../../../components/StyledButton/StyledButton';
 
 function OnboardingScreen() {
   const { session } = useSession();
@@ -168,24 +169,4 @@ function OnboardingScreen() {
   );
 }
 
-const styles = StyleSheet.create({
-  input: {
-    height: 40,
-    borderColor: 'gray',
-    borderWidth: 1,
-    marginTop: 10,
-    padding: 5,
-  },
-  verticallySpaced: {
-    paddingTop: 4,
-    paddingBottom: 4,
-    alignSelf: 'stretch',
-  },
-  container: {
-    paddingVertical: 63,
-    paddingLeft: 43,
-    paddingRight: 44,
-  },
-});
-
 export default OnboardingScreen;
diff --git a/src/app/auth/onboarding/styles.tsx b/src/app/auth/onboarding/styles.tsx
new file mode 100644
index 00000000..daea4952
--- /dev/null
+++ b/src/app/auth/onboarding/styles.tsx
@@ -0,0 +1,21 @@
+import { StyleSheet } from 'react-native';
+
+export default StyleSheet.create({
+  input: {
+    height: 40,
+    borderColor: 'gray',
+    borderWidth: 1,
+    marginTop: 10,
+    padding: 5,
+  },
+  verticallySpaced: {
+    paddingTop: 4,
+    paddingBottom: 4,
+    alignSelf: 'stretch',
+  },
+  container: {
+    paddingVertical: 63,
+    paddingLeft: 43,
+    paddingRight: 44,
+  },
+});
diff --git a/src/app/auth/signup/_layout.tsx b/src/app/auth/signup/_layout.tsx
new file mode 100644
index 00000000..d021a461
--- /dev/null
+++ b/src/app/auth/signup/_layout.tsx
@@ -0,0 +1,11 @@
+import { Stack } from 'expo-router';
+
+function StackLayout() {
+  return (
+    <Stack>
+      <Stack.Screen name="index" options={{ headerShown: false }} />
+    </Stack>
+  );
+}
+
+export default StackLayout;
diff --git a/src/app/auth/signup.tsx b/src/app/auth/signup/index.tsx
similarity index 87%
rename from src/app/auth/signup.tsx
rename to src/app/auth/signup/index.tsx
index cf4ef703..6812b857 100644
--- a/src/app/auth/signup.tsx
+++ b/src/app/auth/signup/index.tsx
@@ -1,18 +1,19 @@
 import { Link, router } from 'expo-router';
 import React, { useEffect, useRef, useState } from 'react';
-import { Alert, Text, View, StyleSheet } from 'react-native';
+import { Alert, Text, View } from 'react-native';
 import { Icon as RNEIcon } from 'react-native-elements';
 import { ScrollView } from 'react-native-gesture-handler';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import validator from 'validator';
 
-import Icon from '../../../assets/icons';
-import StyledButton from '../../components/StyledButton/StyledButton';
-import UserStringInput from '../../components/UserStringInput/UserStringInput';
-import colors from '../../styles/colors';
-import globalStyles from '../../styles/globalStyles';
-import { useSession } from '../../utils/AuthContext';
-import supabase from '../../utils/supabase';
+import styles from './styles';
+import Icon from '../../../../assets/icons';
+import StyledButton from '../../../components/StyledButton/StyledButton';
+import UserStringInput from '../../../components/UserStringInput/UserStringInput';
+import colors from '../../../styles/colors';
+import globalStyles from '../../../styles/globalStyles';
+import { useSession } from '../../../utils/AuthContext';
+import supabase from '../../../utils/supabase';
 
 function SignUpScreen() {
   const { signUp } = useSession();
@@ -315,53 +316,3 @@ function SignUpScreen() {
 }
 
 export default SignUpScreen;
-
-const styles = StyleSheet.create({
-  flex: {
-    flexGrow: 1,
-    flexDirection: 'column',
-    justifyContent: 'space-between',
-  },
-  inputError: {
-    color: 'red',
-    marginTop: 8,
-  },
-  link: {
-    fontWeight: '700',
-    textDecorationLine: 'underline',
-  },
-  redirectText: {
-    textAlign: 'center',
-    marginBottom: 64,
-    marginTop: 16,
-  },
-  title: {
-    fontSize: 24,
-    paddingTop: 64,
-    marginBottom: 23,
-    fontWeight: '700',
-  },
-  icon: {
-    marginRight: 10,
-  },
-  passwordComplexity: {
-    display: 'flex',
-    flexDirection: 'row',
-    paddingBottom: 8,
-  },
-  passwordErrorText: {
-    fontSize: 12,
-    marginLeft: 8,
-  },
-  verticallySpaced: {
-    paddingTop: 4,
-    paddingBottom: 4,
-    alignSelf: 'stretch',
-  },
-  inputs: {
-    paddingBottom: 8,
-  },
-  navigation: {
-    // marginTop: 'auto',
-  },
-});
diff --git a/src/app/auth/signup/styles.tsx b/src/app/auth/signup/styles.tsx
new file mode 100644
index 00000000..63d3b557
--- /dev/null
+++ b/src/app/auth/signup/styles.tsx
@@ -0,0 +1,51 @@
+import { StyleSheet } from 'react-native';
+
+export default StyleSheet.create({
+  flex: {
+    flexGrow: 1,
+    flexDirection: 'column',
+    justifyContent: 'space-between',
+  },
+  inputError: {
+    color: 'red',
+    marginTop: 8,
+  },
+  link: {
+    fontWeight: '700',
+    textDecorationLine: 'underline',
+  },
+  redirectText: {
+    textAlign: 'center',
+    marginBottom: 64,
+    marginTop: 16,
+  },
+  title: {
+    fontSize: 24,
+    paddingTop: 64,
+    marginBottom: 23,
+    fontWeight: '700',
+  },
+  icon: {
+    marginRight: 10,
+  },
+  passwordComplexity: {
+    display: 'flex',
+    flexDirection: 'row',
+    paddingBottom: 8,
+  },
+  passwordErrorText: {
+    fontSize: 12,
+    marginLeft: 8,
+  },
+  verticallySpaced: {
+    paddingTop: 4,
+    paddingBottom: 4,
+    alignSelf: 'stretch',
+  },
+  inputs: {
+    paddingBottom: 8,
+  },
+  navigation: {
+    // marginTop: 'auto',
+  },
+});
diff --git a/src/app/auth/verify/_layout.tsx b/src/app/auth/verify/_layout.tsx
new file mode 100644
index 00000000..d021a461
--- /dev/null
+++ b/src/app/auth/verify/_layout.tsx
@@ -0,0 +1,11 @@
+import { Stack } from 'expo-router';
+
+function StackLayout() {
+  return (
+    <Stack>
+      <Stack.Screen name="index" options={{ headerShown: false }} />
+    </Stack>
+  );
+}
+
+export default StackLayout;
diff --git a/src/app/auth/verify.tsx b/src/app/auth/verify/index.tsx
similarity index 82%
rename from src/app/auth/verify.tsx
rename to src/app/auth/verify/index.tsx
index 28c6ca54..e2d9679a 100644
--- a/src/app/auth/verify.tsx
+++ b/src/app/auth/verify/index.tsx
@@ -1,11 +1,12 @@
 import { router } from 'expo-router';
 import React, { useState } from 'react';
-import { Alert, TextInput, View, StyleSheet } from 'react-native';
+import { Alert, TextInput, View } from 'react-native';
 import { Button } from 'react-native-elements';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
-import globalStyles from '../../styles/globalStyles';
-import { useSession } from '../../utils/AuthContext';
+import styles from './styles';
+import globalStyles from '../../../styles/globalStyles';
+import { useSession } from '../../../utils/AuthContext';
 
 function VerificationScreen() {
   const { user, verifyOtp, resendVerification } = useSession();
@@ -81,21 +82,3 @@ function VerificationScreen() {
 }
 
 export default VerificationScreen;
-
-const styles = StyleSheet.create({
-  input: {
-    height: 40,
-    borderColor: 'gray',
-    borderWidth: 1,
-    marginTop: 10,
-    padding: 5,
-  },
-  verticallySpaced: {
-    paddingTop: 4,
-    paddingBottom: 4,
-    alignSelf: 'stretch',
-  },
-  container: {
-    justifyContent: 'flex-start',
-  },
-});
diff --git a/src/app/auth/verify/styles.tsx b/src/app/auth/verify/styles.tsx
new file mode 100644
index 00000000..119cf0bb
--- /dev/null
+++ b/src/app/auth/verify/styles.tsx
@@ -0,0 +1,19 @@
+import { StyleSheet } from 'react-native';
+
+export default StyleSheet.create({
+  input: {
+    height: 40,
+    borderColor: 'gray',
+    borderWidth: 1,
+    marginTop: 10,
+    padding: 5,
+  },
+  verticallySpaced: {
+    paddingTop: 4,
+    paddingBottom: 4,
+    alignSelf: 'stretch',
+  },
+  container: {
+    justifyContent: 'flex-start',
+  },
+});