diff --git a/.gitignore b/.gitignore
index 31d2a73c..cf709889 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,107 +1 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# Next.js build output
-.next
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and *not* Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# idk 
-**/*workbox*
\ No newline at end of file
+**/node_modules
diff --git a/README.md b/README.md
index 5bd8c435..c0b42f6c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # FRC 991 Scouting
-A QR Code Based Scouting System for FRC, forked from FRC team 2713. 
+A QR Code Based Scouting System for FRC 991, The Broncobots
 
 ## Todo List
 - [ ] Desktop app to view all the compiled data from the scouting app
diff --git a/package.json b/package.json
index d363ee44..1f7b53ef 100644
--- a/package.json
+++ b/package.json
@@ -1,26 +1,5 @@
 {
-  "private": true,
-  "scripts": {
-    "dev": "next dev",
-    "build": "next build",
-    "start": "next start"
-  },
-  "dependencies": {
-    "@tailwindcss/forms": "^0.4.0",
-    "next": "^12.3.4",
-    "next-pwa": "^5.4.6",
-    "qrcode.react": "^3.0.1",
-    "react": "^18.0.2",
-    "react-dom": "^18.0.2"
-  },
-  "devDependencies": {
-    "@types/node": "^18.0.4",
-    "@types/react": "^18.0.28",
-    "autoprefixer": "^10.4.0",
-    "postcss": "^8.4.5",
-    "prettier": "^2.5.1",
-    "prettier-plugin-tailwindcss": "^0.1.1",
-    "tailwindcss": "^3.0.7",
-    "typescript": "^4.9"
-  }
+  "name": "scouting",
+  "scripts": {},
+  "license": "MIT"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 280961ef..e5e39612 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,38 +1,42 @@
 lockfileVersion: 5.4
 
-specifiers:
-  '@tailwindcss/forms': ^0.4.0
-  '@types/node': ^18.0.4
-  '@types/react': ^18.0.28
-  autoprefixer: ^10.4.0
-  next: ^12.3.4
-  next-pwa: ^5.4.6
-  postcss: ^8.4.5
-  prettier: ^2.5.1
-  prettier-plugin-tailwindcss: ^0.1.1
-  qrcode.react: ^3.0.1
-  react: ^18.0.2
-  react-dom: ^18.0.2
-  tailwindcss: ^3.0.7
-  typescript: ^4.9
-
-dependencies:
-  '@tailwindcss/forms': 0.4.1_tailwindcss@3.2.7
-  next: 12.3.4_6m24vuloj5ihw4zc5lbsktc4fu
-  next-pwa: 5.6.0_55uj7t37lr42kn3oixoztpkwhu
-  qrcode.react: 3.1.0_react@18.2.0
-  react: 18.2.0
-  react-dom: 18.2.0_react@18.2.0
-
-devDependencies:
-  '@types/node': 18.14.0
-  '@types/react': 18.0.28
-  autoprefixer: 10.4.13_postcss@8.4.21
-  postcss: 8.4.21
-  prettier: 2.8.4
-  prettier-plugin-tailwindcss: 0.1.13_prettier@2.8.4
-  tailwindcss: 3.2.7_postcss@8.4.21
-  typescript: 4.9.5
+importers:
+
+  .:
+    specifiers: {}
+
+  web-app:
+    specifiers:
+      '@tailwindcss/forms': ^0.4.0
+      '@types/node': ^18.0.4
+      '@types/react': ^18.0.28
+      autoprefixer: ^10.4.0
+      next: ^12.3.4
+      next-pwa: ^5.4.6
+      postcss: ^8.4.5
+      prettier: ^2.5.1
+      prettier-plugin-tailwindcss: ^0.1.1
+      qrcode.react: ^3.0.1
+      react: ^18.0.2
+      react-dom: ^18.0.2
+      tailwindcss: ^3.0.7
+      typescript: ^4.9
+    dependencies:
+      '@tailwindcss/forms': 0.4.1_tailwindcss@3.2.7
+      next: 12.3.4_6m24vuloj5ihw4zc5lbsktc4fu
+      next-pwa: 5.6.0_55uj7t37lr42kn3oixoztpkwhu
+      qrcode.react: 3.1.0_react@18.2.0
+      react: 18.2.0
+      react-dom: 18.2.0_react@18.2.0
+    devDependencies:
+      '@types/node': 18.14.0
+      '@types/react': 18.0.28
+      autoprefixer: 10.4.13_postcss@8.4.21
+      postcss: 8.4.21
+      prettier: 2.8.4
+      prettier-plugin-tailwindcss: 0.1.13_prettier@2.8.4
+      tailwindcss: 3.2.7_postcss@8.4.21
+      typescript: 4.9.5
 
 packages:
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 00000000..e1480b7c
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages: 
+  - web-app
\ No newline at end of file
diff --git a/web-app/.gitignore b/web-app/.gitignore
new file mode 100644
index 00000000..31d2a73c
--- /dev/null
+++ b/web-app/.gitignore
@@ -0,0 +1,107 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# Next.js build output
+.next
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and *not* Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# idk 
+**/*workbox*
\ No newline at end of file
diff --git a/LICENSE b/web-app/LICENSE
similarity index 100%
rename from LICENSE
rename to web-app/LICENSE
diff --git a/web-app/README.md b/web-app/README.md
new file mode 100644
index 00000000..e1184679
--- /dev/null
+++ b/web-app/README.md
@@ -0,0 +1,3 @@
+# 991 Scouting Web App
+The mobile/website part of the 991 Scouting System. 
+Completely stolen from FRC 2713 (Red Hawk Robotics). 
\ No newline at end of file
diff --git a/components/QRModal.tsx b/web-app/components/QRModal.tsx
similarity index 100%
rename from components/QRModal.tsx
rename to web-app/components/QRModal.tsx
diff --git a/components/Section.tsx b/web-app/components/Section.tsx
similarity index 100%
rename from components/Section.tsx
rename to web-app/components/Section.tsx
diff --git a/components/core/Button.tsx b/web-app/components/core/Button.tsx
similarity index 100%
rename from components/core/Button.tsx
rename to web-app/components/core/Button.tsx
diff --git a/components/inputs/BaseInputProps.ts b/web-app/components/inputs/BaseInputProps.ts
similarity index 100%
rename from components/inputs/BaseInputProps.ts
rename to web-app/components/inputs/BaseInputProps.ts
diff --git a/components/inputs/CheckboxInput.tsx b/web-app/components/inputs/CheckboxInput.tsx
similarity index 100%
rename from components/inputs/CheckboxInput.tsx
rename to web-app/components/inputs/CheckboxInput.tsx
diff --git a/components/inputs/ConfigurableInput.tsx b/web-app/components/inputs/ConfigurableInput.tsx
similarity index 100%
rename from components/inputs/ConfigurableInput.tsx
rename to web-app/components/inputs/ConfigurableInput.tsx
diff --git a/components/inputs/CounterInput.tsx b/web-app/components/inputs/CounterInput.tsx
similarity index 100%
rename from components/inputs/CounterInput.tsx
rename to web-app/components/inputs/CounterInput.tsx
diff --git a/components/inputs/InputCard.tsx b/web-app/components/inputs/InputCard.tsx
similarity index 100%
rename from components/inputs/InputCard.tsx
rename to web-app/components/inputs/InputCard.tsx
diff --git a/components/inputs/NumberInput.tsx b/web-app/components/inputs/NumberInput.tsx
similarity index 100%
rename from components/inputs/NumberInput.tsx
rename to web-app/components/inputs/NumberInput.tsx
diff --git a/components/inputs/RangeInput.tsx b/web-app/components/inputs/RangeInput.tsx
similarity index 100%
rename from components/inputs/RangeInput.tsx
rename to web-app/components/inputs/RangeInput.tsx
diff --git a/components/inputs/SelectInput.tsx b/web-app/components/inputs/SelectInput.tsx
similarity index 100%
rename from components/inputs/SelectInput.tsx
rename to web-app/components/inputs/SelectInput.tsx
diff --git a/components/inputs/StringInput.tsx b/web-app/components/inputs/StringInput.tsx
similarity index 100%
rename from components/inputs/StringInput.tsx
rename to web-app/components/inputs/StringInput.tsx
diff --git a/config/2022/config.json b/web-app/config/2022/config.json
similarity index 100%
rename from config/2022/config.json
rename to web-app/config/2022/config.json
diff --git a/config/2022/field_image.png b/web-app/config/2022/field_image.png
similarity index 100%
rename from config/2022/field_image.png
rename to web-app/config/2022/field_image.png
diff --git a/config/schema.json b/web-app/config/schema.json
similarity index 100%
rename from config/schema.json
rename to web-app/config/schema.json
diff --git a/icon.svg b/web-app/icon.svg
similarity index 100%
rename from icon.svg
rename to web-app/icon.svg
diff --git a/next-env.d.ts b/web-app/next-env.d.ts
similarity index 100%
rename from next-env.d.ts
rename to web-app/next-env.d.ts
diff --git a/next.config.mjs b/web-app/next.config.mjs
similarity index 100%
rename from next.config.mjs
rename to web-app/next.config.mjs
diff --git a/web-app/package.json b/web-app/package.json
new file mode 100644
index 00000000..d363ee44
--- /dev/null
+++ b/web-app/package.json
@@ -0,0 +1,26 @@
+{
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start"
+  },
+  "dependencies": {
+    "@tailwindcss/forms": "^0.4.0",
+    "next": "^12.3.4",
+    "next-pwa": "^5.4.6",
+    "qrcode.react": "^3.0.1",
+    "react": "^18.0.2",
+    "react-dom": "^18.0.2"
+  },
+  "devDependencies": {
+    "@types/node": "^18.0.4",
+    "@types/react": "^18.0.28",
+    "autoprefixer": "^10.4.0",
+    "postcss": "^8.4.5",
+    "prettier": "^2.5.1",
+    "prettier-plugin-tailwindcss": "^0.1.1",
+    "tailwindcss": "^3.0.7",
+    "typescript": "^4.9"
+  }
+}
diff --git a/pages/_app.tsx b/web-app/pages/_app.tsx
similarity index 100%
rename from pages/_app.tsx
rename to web-app/pages/_app.tsx
diff --git a/pages/index.tsx b/web-app/pages/index.tsx
similarity index 100%
rename from pages/index.tsx
rename to web-app/pages/index.tsx
diff --git a/postcss.config.js b/web-app/postcss.config.js
similarity index 100%
rename from postcss.config.js
rename to web-app/postcss.config.js
diff --git a/prettier.config.js b/web-app/prettier.config.js
similarity index 100%
rename from prettier.config.js
rename to web-app/prettier.config.js
diff --git a/public/favicon-16x16.png b/web-app/public/favicon-16x16.png
similarity index 100%
rename from public/favicon-16x16.png
rename to web-app/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/web-app/public/favicon-32x32.png
similarity index 100%
rename from public/favicon-32x32.png
rename to web-app/public/favicon-32x32.png
diff --git a/public/favicon.ico b/web-app/public/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to web-app/public/favicon.ico
diff --git a/public/icons/icon-1024x1024.png b/web-app/public/icons/icon-1024x1024.png
similarity index 100%
rename from public/icons/icon-1024x1024.png
rename to web-app/public/icons/icon-1024x1024.png
diff --git a/public/icons/icon-144x144.png b/web-app/public/icons/icon-144x144.png
similarity index 100%
rename from public/icons/icon-144x144.png
rename to web-app/public/icons/icon-144x144.png
diff --git a/public/icons/icon-192x192.png b/web-app/public/icons/icon-192x192.png
similarity index 100%
rename from public/icons/icon-192x192.png
rename to web-app/public/icons/icon-192x192.png
diff --git a/public/icons/icon-36x36.png b/web-app/public/icons/icon-36x36.png
similarity index 100%
rename from public/icons/icon-36x36.png
rename to web-app/public/icons/icon-36x36.png
diff --git a/public/icons/icon-384x384.png b/web-app/public/icons/icon-384x384.png
similarity index 100%
rename from public/icons/icon-384x384.png
rename to web-app/public/icons/icon-384x384.png
diff --git a/public/icons/icon-48x48.png b/web-app/public/icons/icon-48x48.png
similarity index 100%
rename from public/icons/icon-48x48.png
rename to web-app/public/icons/icon-48x48.png
diff --git a/public/icons/icon-512x512.png b/web-app/public/icons/icon-512x512.png
similarity index 100%
rename from public/icons/icon-512x512.png
rename to web-app/public/icons/icon-512x512.png
diff --git a/public/icons/icon-72x72.png b/web-app/public/icons/icon-72x72.png
similarity index 100%
rename from public/icons/icon-72x72.png
rename to web-app/public/icons/icon-72x72.png
diff --git a/public/icons/icon-96x96.png b/web-app/public/icons/icon-96x96.png
similarity index 100%
rename from public/icons/icon-96x96.png
rename to web-app/public/icons/icon-96x96.png
diff --git a/public/manifest.json b/web-app/public/manifest.json
similarity index 100%
rename from public/manifest.json
rename to web-app/public/manifest.json
diff --git a/public/sw.js b/web-app/public/sw.js
similarity index 100%
rename from public/sw.js
rename to web-app/public/sw.js
diff --git a/public/sw.js.map b/web-app/public/sw.js.map
similarity index 100%
rename from public/sw.js.map
rename to web-app/public/sw.js.map
diff --git a/public/vercel.svg b/web-app/public/vercel.svg
similarity index 100%
rename from public/vercel.svg
rename to web-app/public/vercel.svg
diff --git a/styles/globals.css b/web-app/styles/globals.css
similarity index 100%
rename from styles/globals.css
rename to web-app/styles/globals.css
diff --git a/tailwind.config.js b/web-app/tailwind.config.js
similarity index 100%
rename from tailwind.config.js
rename to web-app/tailwind.config.js
diff --git a/tsconfig.json b/web-app/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to web-app/tsconfig.json
diff --git a/util/classNames.ts b/web-app/util/classNames.ts
similarity index 100%
rename from util/classNames.ts
rename to web-app/util/classNames.ts