diff --git a/app.json b/app.json
index 4be3350..4cedf42 100644
--- a/app.json
+++ b/app.json
@@ -19,7 +19,8 @@
         "monochromeImage": "./assets/images/android-icon-monochrome.png"
       },
       "edgeToEdgeEnabled": true,
-      "predictiveBackGestureEnabled": false
+      "predictiveBackGestureEnabled": false,
+      "package": "com.bobthebob.MAD_Treasure_Hunt_App"
     },
     "web": {
       "output": "static",
diff --git a/app/(routes)/admin-hub.tsx b/app/(routes)/admin-hub.tsx
deleted file mode 100644
index 1c7fcdd..0000000
--- a/app/(routes)/admin-hub.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import AdminHubPage from '../Screens/AdminHubPage';
-
-export default AdminHubPage;
-
-
diff --git a/app/(routes)/create-game.tsx b/app/(routes)/create-game.tsx
deleted file mode 100644
index 429a5e9..0000000
--- a/app/(routes)/create-game.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import CreateGamePage from '../Screens/CreateGamePage';
-
-export default CreateGamePage;
diff --git a/app/(routes)/game-lobby.tsx b/app/(routes)/game-lobby.tsx
deleted file mode 100644
index ec913ba..0000000
--- a/app/(routes)/game-lobby.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import GameLobbyPage from '../Screens/GameLobbyPage';
-
-export default GameLobbyPage;
-
-
diff --git a/app/(routes)/game-type.tsx b/app/(routes)/game-type.tsx
deleted file mode 100644
index 926d16f..0000000
--- a/app/(routes)/game-type.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import GameTypePage from '../Screens/GameTypePage';
-
-export default GameTypePage;
-
-
diff --git a/app/(routes)/index.tsx b/app/(routes)/index.tsx
deleted file mode 100644
index 05a4473..0000000
--- a/app/(routes)/index.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Redirect } from "expo-router";
-
-export default function Index() {
-  return <Redirect href="/login" />;
-}
-
diff --git a/app/(routes)/join-private-game.tsx b/app/(routes)/join-private-game.tsx
deleted file mode 100644
index 0a0539b..0000000
--- a/app/(routes)/join-private-game.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import JoinPrivateGamePage from '../Screens/JoinPrivateGamePage';
-
-export default JoinPrivateGamePage;
-
-
diff --git a/app/(routes)/login.tsx b/app/(routes)/login.tsx
deleted file mode 100644
index fa48979..0000000
--- a/app/(routes)/login.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import LoginPage from '../Screens/LoginPage';
-
-export default LoginPage;
-
-
diff --git a/app/(routes)/manage-game.tsx b/app/(routes)/manage-game.tsx
deleted file mode 100644
index 84bbfa6..0000000
--- a/app/(routes)/manage-game.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import ManageGamePage from '../Screens/ManageGamePage';
-
-export default ManageGamePage;
diff --git a/app/(routes)/manage-private-subtask.tsx b/app/(routes)/manage-private-subtask.tsx
deleted file mode 100644
index b8c57d1..0000000
--- a/app/(routes)/manage-private-subtask.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import ManagePrivateSubtaskPage from '../Screens/ManagePrivateSubtaskPage';
-
-export default ManagePrivateSubtaskPage;
-
-
diff --git a/app/(routes)/manage-subgroups.tsx b/app/(routes)/manage-subgroups.tsx
deleted file mode 100644
index e9ec549..0000000
--- a/app/(routes)/manage-subgroups.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import ManageSubgroupsPage from '../Screens/ManageSubgroupsPage';
-
-export default ManageSubgroupsPage;
-
-
diff --git a/app/(routes)/map.tsx b/app/(routes)/map.tsx
deleted file mode 100644
index fbcc6c7..0000000
--- a/app/(routes)/map.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import MapPage from '../Screens/MapPage';
-
-export default MapPage;
-
-
diff --git a/app/(routes)/register.tsx b/app/(routes)/register.tsx
deleted file mode 100644
index f0e4820..0000000
--- a/app/(routes)/register.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import RegisterPage from '../Screens/RegisterPage';
-
-export default RegisterPage;
-
-
diff --git a/app/(routes)/team.tsx b/app/(routes)/team.tsx
deleted file mode 100644
index 7b875c7..0000000
--- a/app/(routes)/team.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import TeamPage from '../Screens/TeamPage';
-
-export default TeamPage;
-
-
diff --git a/app/Screens/AdminHubPage.jsx b/app/Screens/AdminHubPage.js
similarity index 100%
rename from app/Screens/AdminHubPage.jsx
rename to app/Screens/AdminHubPage.js
diff --git a/app/Screens/CreateGamePage.jsx b/app/Screens/CreateGamePage.js
similarity index 100%
rename from app/Screens/CreateGamePage.jsx
rename to app/Screens/CreateGamePage.js
diff --git a/app/Screens/GameLobbyPage.jsx b/app/Screens/GameLobbyPage.js
similarity index 100%
rename from app/Screens/GameLobbyPage.jsx
rename to app/Screens/GameLobbyPage.js
diff --git a/app/Screens/GameTypePage.jsx b/app/Screens/GameTypePage.js
similarity index 100%
rename from app/Screens/GameTypePage.jsx
rename to app/Screens/GameTypePage.js
diff --git a/app/Screens/JoinPrivateGamePage.jsx b/app/Screens/JoinPrivateGamePage.js
similarity index 100%
rename from app/Screens/JoinPrivateGamePage.jsx
rename to app/Screens/JoinPrivateGamePage.js
diff --git a/app/Screens/LoginPage.jsx b/app/Screens/LoginPage.js
similarity index 100%
rename from app/Screens/LoginPage.jsx
rename to app/Screens/LoginPage.js
diff --git a/app/Screens/ManageGamePage.jsx b/app/Screens/ManageGamePage.js
similarity index 100%
rename from app/Screens/ManageGamePage.jsx
rename to app/Screens/ManageGamePage.js
diff --git a/app/Screens/ManagePrivateSubtaskPage.jsx b/app/Screens/ManagePrivateSubtaskPage.js
similarity index 100%
rename from app/Screens/ManagePrivateSubtaskPage.jsx
rename to app/Screens/ManagePrivateSubtaskPage.js
diff --git a/app/Screens/ManageSubgroupsPage.jsx b/app/Screens/ManageSubgroupsPage.js
similarity index 100%
rename from app/Screens/ManageSubgroupsPage.jsx
rename to app/Screens/ManageSubgroupsPage.js
diff --git a/app/Screens/MapPage.jsx b/app/Screens/MapPage.js
similarity index 100%
rename from app/Screens/MapPage.jsx
rename to app/Screens/MapPage.js
diff --git a/app/Screens/RegisterPage.jsx b/app/Screens/RegisterPage.js
similarity index 100%
rename from app/Screens/RegisterPage.jsx
rename to app/Screens/RegisterPage.js
diff --git a/app/Screens/TeamPage.jsx b/app/Screens/TeamPage.js
similarity index 100%
rename from app/Screens/TeamPage.jsx
rename to app/Screens/TeamPage.js
diff --git a/app/_layout.tsx b/app/_layout.tsx
index 259b8ab..a2edc37 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -4,33 +4,33 @@ export default function RootLayout() {
   return (
     <Stack initialRouteName="(routes)/index" screenOptions={{ headerShown: false }}>
       <Stack.Screen 
-        name="(routes)/index" 
+        name="Screens/LoginPage"
         options={{
           gestureEnabled: false,
         }}
       />
       <Stack.Screen 
-        name="(routes)/login" 
+        name="Screens/LoginPage"
         options={{
           gestureEnabled: false,
         }}
       />
       <Stack.Screen 
-        name="(routes)/register" 
+        name="Screens/RegisterPage"
         options={{
           gestureEnabled: false,
         }}
       />
-      <Stack.Screen name="(routes)/game-type" />
-      <Stack.Screen name="(routes)/join-private-game" />
-      <Stack.Screen name="(routes)/manage-private-subtask" />
-      <Stack.Screen name="(routes)/create-game" />
-      <Stack.Screen name="(routes)/manage-game" />
-      <Stack.Screen name="(routes)/game-lobby" />
-      <Stack.Screen name="(routes)/team" />
-      <Stack.Screen name="(routes)/map" />
-      <Stack.Screen name="(routes)/admin-hub" />
-      <Stack.Screen name="(routes)/manage-subgroups" />
+      <Stack.Screen name="Screens/GameTypePage"/>
+      <Stack.Screen name="Screens/JoinPrivateGamePage" />
+      <Stack.Screen name="Screens/ManagePrivateSubtaskPage" />
+      <Stack.Screen name="Screens/CreateGamePage" />
+      <Stack.Screen name="Screens/ManageGamePage" />
+      <Stack.Screen name="Screens/GameLobbyPage" />
+      <Stack.Screen name="Screens/TeamPage" />
+      <Stack.Screen name="Screens/MapPage" />
+      <Stack.Screen name="Screens/AdminHubPage" />
+      <Stack.Screen name="Screens/ManageSubgroupsPage" />
     </Stack>
   );
 }
diff --git a/app/components/AdminFooterNavbar.jsx b/app/components/AdminFooterNavbar.js
similarity index 100%
rename from app/components/AdminFooterNavbar.jsx
rename to app/components/AdminFooterNavbar.js
diff --git a/app/components/MemberFooterNavbar.jsx b/app/components/MemberFooterNavbar.js
similarity index 100%
rename from app/components/MemberFooterNavbar.jsx
rename to app/components/MemberFooterNavbar.js
diff --git a/app/components/ScreenHeader.jsx b/app/components/ScreenHeader.js
similarity index 100%
rename from app/components/ScreenHeader.jsx
rename to app/components/ScreenHeader.js
diff --git a/package.json b/package.json
index 3df79f3..eabd380 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "scripts": {
     "start": "expo start",
     "reset-project": "node ./scripts/reset-project.js",
-    "android": "expo start --android",
-    "ios": "expo start --ios",
+    "android": "expo run:android",
+    "ios": "expo run:ios",
     "web": "expo start --web",
     "lint": "expo lint"
   },