diff --git a/app/static/js/pit-scouting.add.js b/app/static/js/pit-scouting/add.js
similarity index 100%
rename from app/static/js/pit-scouting.add.js
rename to app/static/js/pit-scouting/add.js
diff --git a/app/static/js/pit-scouting.edit.js b/app/static/js/pit-scouting/edit.js
similarity index 100%
rename from app/static/js/pit-scouting.edit.js
rename to app/static/js/pit-scouting/edit.js
diff --git a/app/static/js/scout.add.js b/app/static/js/scout/add.js
similarity index 100%
rename from app/static/js/scout.add.js
rename to app/static/js/scout/add.js
diff --git a/app/static/js/scout.edit.js b/app/static/js/scout/edit.js
similarity index 100%
rename from app/static/js/scout.edit.js
rename to app/static/js/scout/edit.js
diff --git a/app/static/js/scout.list.js b/app/static/js/scout/list.js
similarity index 100%
rename from app/static/js/scout.list.js
rename to app/static/js/scout/list.js
diff --git a/app/static/js/team.manage.js b/app/static/js/team/manage.js
similarity index 100%
rename from app/static/js/team.manage.js
rename to app/static/js/team/manage.js
diff --git a/app/static/manifest.json b/app/static/manifest.json
index c7efd8f..f035ca1 100644
--- a/app/static/manifest.json
+++ b/app/static/manifest.json
@@ -3,7 +3,7 @@
   "short_name": "Castle",
   "description": "FRC Team Scouting App",
   "start_url": "/",
-  "display": "standalone",
+  "display": "fullscreen",
   "background_color": "#ffffff",
   "theme_color": "#3b82f6",
   
diff --git a/app/templates/community-guidlines.md b/app/templates/community-guidlines.md
deleted file mode 100644
index 5b2e6b9..0000000
--- a/app/templates/community-guidlines.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Castle Community Guidelines
-
-## Our Mission
-Castle is committed to making FRC scouting accessible to every team, regardless of their size or resources. We believe that collaborative scouting strengthens the entire FIRST Robotics community and incorporates the spirit of Gracious Professionalism®.
-
-## Core Values
-- **Inclusivity**: We welcome teams of all sizes, experience levels, and backgrounds.
-- **Collaboration**: We encourage sharing knowledge and helping other teams succeed.
-- **Integrity**: We promote honest and accurate data collection.
-- **Respect**: We treat all teams and their data with respect.
-- **Education**: We support learning and growth within the scouting community.
-
-## Expected Behavior
-1. **Data Integrity**
-   - Submiting data that isn't disrespected to the team or their robot.
-   - Double-check your entries before submission
-   - Report any errors or inconsistencies you notice
-
-2. **Respectful Communication**
-   - Be courteous in all interactions
-   - Provide constructive feedback
-   - Avoid negative comments about other teams' performances
-
-3. **Collaboration**
-   - Share best practices and tips with other teams
-   - Help new teams learn effective scouting techniques
-   - Contribute to the community's knowledge base
-   - Be open to learning from others
-
-4. **Privacy & Consent**
-   - Respect teams' privacy regarding sensitive strategy information
-   - Use the platform's built-in sharing features appropriately
-   - Never share personal information about team members
-   - Obtain explicit permission before sharing team-specific data
-   - Report any privacy concerns immediately
-   - Follow data retention and deletion guidelines
-
-## Prohibited Behavior
-- Intentionally submitting false or misleading data
-- Harassment or bullying of any kind
-- Sharing private team information without consent
-- Attempting to manipulate or spam the system
-
-## Supporting New Teams
-We encourage experienced teams to:
-- Mentor new teams in scouting practices
-- Provide guidance on data analysis
-- Help troubleshoot common issues
-
-## Reporting Issues
-If you encounter any violations of these guidelines or technical issues:
-1. Use the built-in reporting features
-2. Email support with detailed information
-
-## Updates & Amendments
-These guidelines may be updated periodically to better serve our community. Users will be notified of any significant changes.
-
-Remember: Our goal is to create a collaborative environment where all teams can succeed in their scouting efforts. By following these guidelines, you help make FRC scouting more accessible and effective for everyone.
\ No newline at end of file
diff --git a/app/templates/privacy.md b/app/templates/privacy.md
deleted file mode 100644
index c08b0a0..0000000
--- a/app/templates/privacy.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# Castle Privacy Policy
-
-## Our Commitment
-Castle is committed to protecting your privacy and securing your data. This policy explains how we collect, use, and protect information in accordance with data protection laws and FIRST Robotics Competition values.
-
-## 1. Information We Collect
-### 1.1 Essential Information
-- Team number and FIRST affiliation
-- Team member names and roles
-- Contact information for team administrators
-- Account credentials
-
-### 1.2 Scouting Data
-- Match and competition data
-- Team performance metrics
-- Robot capabilities and strategies
-- Pit scouting information
-
-### 1.3 System Data
-- Access logs and timestamps
-- Device information for security
-- Error reports for system improvement
-- Usage patterns for feature enhancement
-
-## 2. How We Use Your Data
-### 2.1 Core Functions
-- Providing scouting services
-- Team performance analysis
-- Competition preparation
-- System maintenance and security
-
-### 2.2 Data Protection Measures
-- End-to-end encryption for sensitive data
-- Regular security audits and updates
-- Restricted access controls
-- Automated threat detection
-- Regular data backups
-
-### 2.3 Data Sharing Controls
-- Team administrators control sharing settings
-- Explicit consent required for data sharing
-- Granular permission settings
-- Clear sharing status indicators
-
-## 3. Your Data Rights
-### 3.1 Access and Control
-- View all collected data
-- Update or correct information
-- Request data deletion
-
-### 3.2 Data Retention
-- Active data maintained securely
-- Regular data accuracy reviews
-
-## 4. Security Incident Response
-### 4.1 Our Commitment
-- Immediate incident investigation
-- Prompt notification of affected users
-- Transparent incident reporting
-- Corrective action implementation
-
-### 4.2 Reporting Security Concerns
-- In-app reporting system
-- Direct email: no-reply@castle-scouting.com
-- 24-hour response commitment
-- Regular security status updates
-
-## 5. Third-Party Services
-### 5.1 Limited Integration
-- Essential FIRST Robotics services only
-- The Blue Alliance API integration
-- Secure hosting providers
-- Carefully vetted service providers
-
-### 5.2 Data Processing Agreements
-- Strict confidentiality requirements
-- Data protection obligations
-- Regular compliance verification
-- Limited data access
-
-## 6. Updates to Privacy Policy
-- Advance notice of changes
-- In-app announcements
-- Change log maintenance
-
-## 7. Data Protection Rights
-You have the right to:
-- Access your personal data
-- Correct inaccurate data
-- Request data deletion
-- Restrict data processing
-- Data portability
-- Object to processing
-- Withdraw consent
-
-## 8. Compliance
-We adhere to:
-- Data protection regulations
-- FIRST youth protection policies
-- Industry security standards
-- Privacy best practices
-
-Last Updated: [Current Date]
diff --git a/app/templates/scouting/add.html b/app/templates/scouting/add.html
index 2c7bd85..0ba60df 100644
--- a/app/templates/scouting/add.html
+++ b/app/templates/scouting/add.html
@@ -356,6 +356,6 @@ <h3 class="text-lg font-semibold text-gray-900 mb-6">Additional Notes</h3>
 </div>
 
 <script src="{{ url_for('static', filename='js/CanvasCoordinateSystem.js') }}"></script>
-<script src="{{ url_for('static', filename='js/scout.add.js') }}"></script>
+<script src="{{ url_for('static', filename='js/scout/add.js') }}"></script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/scouting/edit.html b/app/templates/scouting/edit.html
index 2bffa3c..a89fac4 100644
--- a/app/templates/scouting/edit.html
+++ b/app/templates/scouting/edit.html
@@ -344,5 +344,5 @@ <h2 class="text-lg font-semibold text-gray-700 mb-4">Additional Notes</h2>
 </div>
 
 <script src="{{ url_for('static', filename='js/CanvasCoordinateSystem.js') }}"></script>
-<script src="{{ url_for('static', filename='js/scout.edit.js') }}"></script>
+<script src="{{ url_for('static', filename='js/scout/edit.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/scouting/list.html b/app/templates/scouting/list.html
index e65b50b..2c3d0ff 100644
--- a/app/templates/scouting/list.html
+++ b/app/templates/scouting/list.html
@@ -269,5 +269,5 @@ <h2 class="text-xl font-semibold mb-4 bg-gray-100 rounded px-4 py-2">
 </div>
 
 <script src="{{ url_for('static', filename='js/CanvasCoordinateSystem.js') }}"></script>
-<script src="{{ url_for('static', filename='js/scout.list.js') }}"></script>
+<script src="{{ url_for('static', filename='js/scout/list.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/scouting/pit-scouting-add.html b/app/templates/scouting/pit-scouting-add.html
index 1792c18..133166e 100644
--- a/app/templates/scouting/pit-scouting-add.html
+++ b/app/templates/scouting/pit-scouting-add.html
@@ -280,5 +280,5 @@ <h3 class="text-lg font-semibold text-gray-900 mb-6">Additional Notes</h3>
     </div>
 </div>
 
-<script src=" {{url_for('static', filename='js/pit-scouting.add.js')}} "></script>
+<script src=" {{url_for('static', filename='js/pit-scouting/add.js')}} "></script>
 {% endblock %} 
\ No newline at end of file
diff --git a/app/templates/scouting/pit-scouting-edit.html b/app/templates/scouting/pit-scouting-edit.html
index d424285..422fa5e 100644
--- a/app/templates/scouting/pit-scouting-edit.html
+++ b/app/templates/scouting/pit-scouting-edit.html
@@ -286,5 +286,5 @@ <h3 class="text-lg font-semibold text-gray-900 mb-6">Additional Notes</h3>
         </form>
     </div>
 </div>
-<script src="{{ url_for('staitc', filename='js/pit-scouting.edit.js') }}"></script>
+<script src="{{ url_for('staitc', filename='js/pit-scouting/edit.js') }}"></script>
 {% endblock %} 
\ No newline at end of file
diff --git a/app/templates/team/manage.html b/app/templates/team/manage.html
index 7adbb4b..dfb8329 100644
--- a/app/templates/team/manage.html
+++ b/app/templates/team/manage.html
@@ -496,7 +496,7 @@ <h3 class="text-lg font-medium leading-6 text-gray-900 mb-4">Edit Assignment</h3
             </div>
         </div>
     </div>
-    <script src="{{ url_for('static', filename='js/team.manage.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/team/manage.js') }}"></script>
     <script>
         function toggleDescription(button) {
             const container = button.closest('.text-gray-700');
diff --git a/app/templates/tos.md b/app/templates/tos.md
deleted file mode 100644
index f1ab63a..0000000
--- a/app/templates/tos.md
+++ /dev/null
@@ -1,80 +0,0 @@
-## Terms of Service
-
-### 1. Acceptance of Terms
-By accessing and using Castle ("the Service"), you agree to be bound by these Terms of Service and our Community Guidelines. If you do not agree to these terms, please do not use the Service.
-
-### 2. User Accounts
-- Users must be affiliated with an FRC team or the FIRST Robotics Competition
-- Account information must be accurate and up-to-date
-- Users are responsible for maintaining the security of their accounts
-- Sharing of accounts is prohibited
-
-### 3. Data Usage and Privacy
-- User data will only be used for the purpose of FRC scouting
-- Personal information is protected according to our Privacy Policy
-- Teams retain ownership of their scouting data
-- Aggregate, anonymized data may be used for platform improvements
-- Data sharing settings are controlled by team administrators
-
-### 4. Acceptable Use
-Users agree not to:
-- Violate any laws or regulations
-- Impersonate others or misrepresent team affiliations
-- Upload malicious code or content
-- Attempt to gain unauthorized access
-- Use the service for non-FRC related purposes
-
-### 5. Content Guidelines
-- All content must be appropriate for the FIRST community
-- Users are responsible for the content they post
-- Castle reserves the right to remove inappropriate content
-- Content should respect intellectual property rights
-
-### 6. Service Modifications
-Castle reserves the right to:
-- Modify or discontinue features
-- Update these terms with reasonable notice
-- Suspend accounts that violate these terms
-- Make changes to improve user experience
-
-### 7. Liability
-Castle strives to provide reliable service but is not liable for:
-- Service interruptions
-- Data loss outside our control
-- Third-party actions
-- Force majeure events
-
-### 8. Data Security
-### 8.1 Service Availability & Data Protection
-- Castle takes responsibility for protecting your data
-- We implement industry-standard security measures
-- Regular backups and data protection protocols
-- Immediate notification of any security breaches
-- Compliance with data protection regulations
-
-### 8.2 Our Responsibilities
-Castle is responsible for:
-- Securing stored team and scouting data
-- Maintaining data accuracy as submitted
-- Providing reliable access to services
-- Protecting user privacy
-- Following data retention policies
-- Responding to data-related concerns promptly
-
-### 8.3 Reporting Issues
-If you discover any data security concerns:
-- Report immediately through our in-app system
-- Contact support@castle-scouting.com
-- We will investigate and respond within 24 hours
-- Affected users will be notified of any breaches
-
-### 9. Termination
-We may terminate or suspend access to the Service:
-- For violations of these terms
-- At the request of FIRST Robotics
-- To protect other users
-
-### 10. Contact
-For questions about these terms:
-- Email: [support email]
-- Submit feedback through the platform