diff --git a/src/app/Fragments/Armory/index.tsx b/src/Fragments/Armory/index.tsx
similarity index 75%
rename from src/app/Fragments/Armory/index.tsx
rename to src/Fragments/Armory/index.tsx
index c333b76..4303d18 100644
--- a/src/app/Fragments/Armory/index.tsx
+++ b/src/Fragments/Armory/index.tsx
@@ -1,6 +1,6 @@
-import { sectionLinks } from "@/app/lib/linkList/sectionLinks";
+import { sectionLinks } from "../../lib/linkList/sectionLinks";
 import Link from "next/link";
-import armoryLinks from "@/app/lib/linkList/sectionLinks";
+import armoryLinks from "../../lib/linkList/sectionLinks";
 
 let linksArray = [
     sectionLinks.UPPERS,
@@ -9,10 +9,10 @@ let linksArray = [
     sectionLinks.OPTICS,
     sectionLinks.ACCESSORIES,  
 ];
-export const Armory = (props) => {
+export const Armory = (props:any) => {
     return (
         (<div>
-            {armoryLinks.length}
+            
             <h4>{props.titleText}</h4>
             <ul>
                 {linksArray.map((link, index) => (
diff --git a/src/app/Fragments/Armory/package.json b/src/Fragments/Armory/package.json
similarity index 100%
rename from src/app/Fragments/Armory/package.json
rename to src/Fragments/Armory/package.json
diff --git a/src/app/Fragments/Armory/style.module.scss b/src/Fragments/Armory/style.module.scss
similarity index 100%
rename from src/app/Fragments/Armory/style.module.scss
rename to src/Fragments/Armory/style.module.scss
diff --git a/src/app/Fragments/Button/index.js b/src/Fragments/Button/index.js
similarity index 100%
rename from src/app/Fragments/Button/index.js
rename to src/Fragments/Button/index.js
diff --git a/src/app/Fragments/Button/package.json b/src/Fragments/Button/package.json
similarity index 100%
rename from src/app/Fragments/Button/package.json
rename to src/Fragments/Button/package.json
diff --git a/src/app/Fragments/Button/style.module.scss b/src/Fragments/Button/style.module.scss
similarity index 100%
rename from src/app/Fragments/Button/style.module.scss
rename to src/Fragments/Button/style.module.scss
diff --git a/src/app/Fragments/DSTPageHeader/index.js b/src/Fragments/DSTPageHeader/index.js
similarity index 100%
rename from src/app/Fragments/DSTPageHeader/index.js
rename to src/Fragments/DSTPageHeader/index.js
diff --git a/src/app/Fragments/DSTPageHeader/package.json b/src/Fragments/DSTPageHeader/package.json
similarity index 100%
rename from src/app/Fragments/DSTPageHeader/package.json
rename to src/Fragments/DSTPageHeader/package.json
diff --git a/src/app/Fragments/DSTPageHeader/styles.module.css b/src/Fragments/DSTPageHeader/styles.module.css
similarity index 100%
rename from src/app/Fragments/DSTPageHeader/styles.module.css
rename to src/Fragments/DSTPageHeader/styles.module.css
diff --git a/src/app/Fragments/Error/index.js b/src/Fragments/Error/index.js
similarity index 100%
rename from src/app/Fragments/Error/index.js
rename to src/Fragments/Error/index.js
diff --git a/src/app/Fragments/Error/package.json b/src/Fragments/Error/package.json
similarity index 100%
rename from src/app/Fragments/Error/package.json
rename to src/Fragments/Error/package.json
diff --git a/src/app/Fragments/Error/style.module.css b/src/Fragments/Error/style.module.css
similarity index 100%
rename from src/app/Fragments/Error/style.module.css
rename to src/Fragments/Error/style.module.css
diff --git a/src/app/Fragments/FooterLink/index.tsx b/src/Fragments/FooterLink/index.tsx
similarity index 100%
rename from src/app/Fragments/FooterLink/index.tsx
rename to src/Fragments/FooterLink/index.tsx
diff --git a/src/app/Fragments/FooterLink/package.json b/src/Fragments/FooterLink/package.json
similarity index 100%
rename from src/app/Fragments/FooterLink/package.json
rename to src/Fragments/FooterLink/package.json
diff --git a/src/app/Fragments/FooterLink/styles.module.css b/src/Fragments/FooterLink/styles.module.css
similarity index 100%
rename from src/app/Fragments/FooterLink/styles.module.css
rename to src/Fragments/FooterLink/styles.module.css
diff --git a/src/app/Fragments/GroundZero/index.tsx b/src/Fragments/GroundZero/index.tsx
similarity index 100%
rename from src/app/Fragments/GroundZero/index.tsx
rename to src/Fragments/GroundZero/index.tsx
diff --git a/src/app/Fragments/GroundZero/package.json b/src/Fragments/GroundZero/package.json
similarity index 100%
rename from src/app/Fragments/GroundZero/package.json
rename to src/Fragments/GroundZero/package.json
diff --git a/src/app/Fragments/GroundZero/style.module.scss b/src/Fragments/GroundZero/style.module.scss
similarity index 100%
rename from src/app/Fragments/GroundZero/style.module.scss
rename to src/Fragments/GroundZero/style.module.scss
diff --git a/src/app/Fragments/Information/index.tsx b/src/Fragments/Information/index.tsx
similarity index 100%
rename from src/app/Fragments/Information/index.tsx
rename to src/Fragments/Information/index.tsx
diff --git a/src/app/Fragments/Information/package.json b/src/Fragments/Information/package.json
similarity index 100%
rename from src/app/Fragments/Information/package.json
rename to src/Fragments/Information/package.json
diff --git a/src/app/Fragments/Information/style.module.scss b/src/Fragments/Information/style.module.scss
similarity index 100%
rename from src/app/Fragments/Information/style.module.scss
rename to src/Fragments/Information/style.module.scss
diff --git a/src/app/Fragments/States/index.tsx b/src/Fragments/States/index.tsx
similarity index 100%
rename from src/app/Fragments/States/index.tsx
rename to src/Fragments/States/index.tsx
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index b5807f7..c8749a1 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,3 +1,4 @@
+import "../styles/globals.css";
 export const metadata = {
   title: 'Next.js',
   description: 'Generated by Next.js',
diff --git a/src/app/page.tsx b/src/app/page.tsx
index ca0688a..14e3886 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,11 +1,9 @@
-import "./globals.css"
-import Link from "next/link";
-import FeaturesSection from "./components/FeaturesSection";
-import About from "./components/About";
-import Header from "./components/Header";
-import Hero from "./components/Hero";
-import Contact from "./components/Contact";
-import Footer from "./components/Footer ";
+import FeaturesSection from "../components/FeaturesSection";
+import About from "../components/About";
+import Header from "../components/Header";
+import Hero from "../components/Hero";
+import Contact from "../components/Contact";
+import Footer from "../components/Footer ";
 import { ChakraProvider } from "@chakra-ui/react";
 
 export default function Home() {
diff --git a/src/app/sign-up/page.tsx b/src/app/sign-up/page.tsx
new file mode 100644
index 0000000..84c8607
--- /dev/null
+++ b/src/app/sign-up/page.tsx
@@ -0,0 +1,10 @@
+
+import { ChakraProvider } from "@chakra-ui/react";
+
+export default function SignUp() {
+  return (
+    <div className="bg-gray-100 min-h-screen flex flex-col">
+     Sign Up info goes here 
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/src/app/components/About/index.tsx b/src/components/About/index.tsx
similarity index 100%
rename from src/app/components/About/index.tsx
rename to src/components/About/index.tsx
diff --git a/src/app/components/Base_Component/index.tsx b/src/components/Base_Component/index.tsx
similarity index 100%
rename from src/app/components/Base_Component/index.tsx
rename to src/components/Base_Component/index.tsx
diff --git a/src/app/components/Contact/index.tsx b/src/components/Contact/index.tsx
similarity index 100%
rename from src/app/components/Contact/index.tsx
rename to src/components/Contact/index.tsx
diff --git a/src/app/components/FeaturesSection/index.tsx b/src/components/FeaturesSection/index.tsx
similarity index 100%
rename from src/app/components/FeaturesSection/index.tsx
rename to src/components/FeaturesSection/index.tsx
diff --git a/src/app/components/Footer /index.tsx b/src/components/Footer /index.tsx
similarity index 100%
rename from src/app/components/Footer /index.tsx
rename to src/components/Footer /index.tsx
diff --git a/src/app/components/GB_Footer/FooterLinks/index copy.js b/src/components/GB_Footer/FooterLinks/index copy.js
similarity index 100%
rename from src/app/components/GB_Footer/FooterLinks/index copy.js
rename to src/components/GB_Footer/FooterLinks/index copy.js
diff --git a/src/app/components/GB_Footer/FooterLinks/index.js b/src/components/GB_Footer/FooterLinks/index.js
similarity index 96%
rename from src/app/components/GB_Footer/FooterLinks/index.js
rename to src/components/GB_Footer/FooterLinks/index.js
index 85bbd28..c681323 100644
--- a/src/app/components/GB_Footer/FooterLinks/index.js
+++ b/src/components/GB_Footer/FooterLinks/index.js
@@ -8,7 +8,7 @@ import TypoGraphy from '@mui/material/Typography'
 import Link from 'next/link'
 import { withStyles } from '@mui/material/styles';
 import styled from '@emotion/styled'
-import FooterLink from '@/src/app/Fragments/FooterLink';
+import FooterLink from '@/src/Fragments/FooterLink';
 
 
 class FooterLinks extends React.Component {
diff --git a/src/app/components/GB_Footer/FooterLinks/package.json b/src/components/GB_Footer/FooterLinks/package.json
similarity index 100%
rename from src/app/components/GB_Footer/FooterLinks/package.json
rename to src/components/GB_Footer/FooterLinks/package.json
diff --git a/src/app/components/GB_Footer/FooterLinks/styles.module.css b/src/components/GB_Footer/FooterLinks/styles.module.css
similarity index 100%
rename from src/app/components/GB_Footer/FooterLinks/styles.module.css
rename to src/components/GB_Footer/FooterLinks/styles.module.css
diff --git a/src/app/components/GB_Footer/index.tsx b/src/components/GB_Footer/index.tsx
similarity index 72%
rename from src/app/components/GB_Footer/index.tsx
rename to src/components/GB_Footer/index.tsx
index 9b98635..3a684ba 100644
--- a/src/app/components/GB_Footer/index.tsx
+++ b/src/components/GB_Footer/index.tsx
@@ -1,14 +1,14 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import styles from './styles.module.scss';
-import Copyright from "@/src/app/components/GB_Info/Copyright";
+import Copyright from "@/src/components/GB_Info/Copyright";
 import FooterLinks from "./FooterLinks";
 import Link from "next/link";
-import { infoLinks } from "@/src/app/lib/linkList/infoLinks";
-import { sectionLinks } from "@/src//app/lib/linkList/sectionLinks";
-import Armory from '@/src/app/Fragments/Armory';
-import GroundZero from "@/src/app/Fragments/GroundZero";
-import Information from "@/src/app/Fragments/Information";
+import { infoLinks } from "@/src/lib/linkList/infoLinks";
+import { sectionLinks } from "@/src/lib/linkList/sectionLinks";
+import Armory from '@/src/Fragments/Armory';
+import GroundZero from "@/src/Fragments/GroundZero";
+import Information from "@/src/Fragments/Information";
 export const Footer = () => {
 
   return (
diff --git a/src/app/components/GB_Footer/package.json b/src/components/GB_Footer/package.json
similarity index 100%
rename from src/app/components/GB_Footer/package.json
rename to src/components/GB_Footer/package.json
diff --git a/src/app/components/GB_Footer/styles.module.scss b/src/components/GB_Footer/styles.module.scss
similarity index 100%
rename from src/app/components/GB_Footer/styles.module.scss
rename to src/components/GB_Footer/styles.module.scss
diff --git a/src/app/components/GB_Header/index.tsx b/src/components/GB_Header/index.tsx
similarity index 100%
rename from src/app/components/GB_Header/index.tsx
rename to src/components/GB_Header/index.tsx
diff --git a/src/app/components/GB_Header/package.json b/src/components/GB_Header/package.json
similarity index 100%
rename from src/app/components/GB_Header/package.json
rename to src/components/GB_Header/package.json
diff --git a/src/app/components/GB_Header/styles.module.css b/src/components/GB_Header/styles.module.css
similarity index 100%
rename from src/app/components/GB_Header/styles.module.css
rename to src/components/GB_Header/styles.module.css
diff --git a/src/app/components/GB_Hero/index.tsx b/src/components/GB_Hero/index.tsx
similarity index 100%
rename from src/app/components/GB_Hero/index.tsx
rename to src/components/GB_Hero/index.tsx
diff --git a/src/app/components/GB_Hero/package.json b/src/components/GB_Hero/package.json
similarity index 100%
rename from src/app/components/GB_Hero/package.json
rename to src/components/GB_Hero/package.json
diff --git a/src/app/components/GB_Hero/styles.module.css b/src/components/GB_Hero/styles.module.css
similarity index 100%
rename from src/app/components/GB_Hero/styles.module.css
rename to src/components/GB_Hero/styles.module.css
diff --git a/src/app/components/GB_Info/About/index.tsx b/src/components/GB_Info/About/index.tsx
similarity index 100%
rename from src/app/components/GB_Info/About/index.tsx
rename to src/components/GB_Info/About/index.tsx
diff --git a/src/app/components/GB_Info/About/package.json b/src/components/GB_Info/About/package.json
similarity index 100%
rename from src/app/components/GB_Info/About/package.json
rename to src/components/GB_Info/About/package.json
diff --git a/src/app/components/GB_Info/About/styles.module.css b/src/components/GB_Info/About/styles.module.css
similarity index 100%
rename from src/app/components/GB_Info/About/styles.module.css
rename to src/components/GB_Info/About/styles.module.css
diff --git a/src/app/components/GB_Info/ContactUs/index.tsx b/src/components/GB_Info/ContactUs/index.tsx
similarity index 95%
rename from src/app/components/GB_Info/ContactUs/index.tsx
rename to src/components/GB_Info/ContactUs/index.tsx
index 1198a76..948387a 100644
--- a/src/app/components/GB_Info/ContactUs/index.tsx
+++ b/src/components/GB_Info/ContactUs/index.tsx
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import TypoGraphy from '@mui/material/Typography';
 import PropTypes from 'prop-types' //ES6
 import styles from './styles.module.css';
-import constants from '@/src/app/lib/constants'
+import constants from '@/src/lib/constants'
 
 import { useQuery, useMutation, gql } from "@apollo/client";
 
diff --git a/src/app/components/GB_Info/ContactUs/package.json b/src/components/GB_Info/ContactUs/package.json
similarity index 100%
rename from src/app/components/GB_Info/ContactUs/package.json
rename to src/components/GB_Info/ContactUs/package.json
diff --git a/src/app/components/GB_Info/ContactUs/styles.module.css b/src/components/GB_Info/ContactUs/styles.module.css
similarity index 100%
rename from src/app/components/GB_Info/ContactUs/styles.module.css
rename to src/components/GB_Info/ContactUs/styles.module.css
diff --git a/src/app/components/GB_Info/Copyright/index.tsx b/src/components/GB_Info/Copyright/index.tsx
similarity index 92%
rename from src/app/components/GB_Info/Copyright/index.tsx
rename to src/components/GB_Info/Copyright/index.tsx
index 5240e47..46f411d 100644
--- a/src/app/components/GB_Info/Copyright/index.tsx
+++ b/src/components/GB_Info/Copyright/index.tsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { COMPANY_NAME, COMPANY_URL } from '@/src/app/lib/constants';
+import { COMPANY_NAME, COMPANY_URL } from '@/src/lib/constants';
 import Typography from '@mui/material/Typography';
 import MuiLink from '@mui/material/Link';
 import styles from './styles.module.css'
diff --git a/src/app/components/GB_Info/Copyright/package.json b/src/components/GB_Info/Copyright/package.json
similarity index 100%
rename from src/app/components/GB_Info/Copyright/package.json
rename to src/components/GB_Info/Copyright/package.json
diff --git a/src/app/components/GB_Info/Copyright/styles.module.css b/src/components/GB_Info/Copyright/styles.module.css
similarity index 100%
rename from src/app/components/GB_Info/Copyright/styles.module.css
rename to src/components/GB_Info/Copyright/styles.module.css
diff --git a/src/app/components/GB_Info/Disclosure/index.tsx b/src/components/GB_Info/Disclosure/index.tsx
similarity index 96%
rename from src/app/components/GB_Info/Disclosure/index.tsx
rename to src/components/GB_Info/Disclosure/index.tsx
index c4eac88..78e2aa8 100644
--- a/src/app/components/GB_Info/Disclosure/index.tsx
+++ b/src/components/GB_Info/Disclosure/index.tsx
@@ -2,8 +2,8 @@ import React, { Component } from 'react'
 import TypoGraphy from '@mui/material/Typography';
 import PropTypes from 'prop-types' //ES6
 import styles from './styles.module.css';
-import constants from '@/src/app/lib/constants'
-import {SITE_CONT_TYPE} from '@/src/app/lib/constants'
+import constants from '@/src/lib/constants'
+import {SITE_CONT_TYPE} from '@/src/lib/constants'
 import { useQuery, useMutation, gql } from "@apollo/client";
 
 export default function Disclosure(props) {
diff --git a/src/app/components/GB_Info/Disclosure/package.json b/src/components/GB_Info/Disclosure/package.json
similarity index 100%
rename from src/app/components/GB_Info/Disclosure/package.json
rename to src/components/GB_Info/Disclosure/package.json
diff --git a/src/app/components/GB_Info/Disclosure/styles.module.css b/src/components/GB_Info/Disclosure/styles.module.css
similarity index 100%
rename from src/app/components/GB_Info/Disclosure/styles.module.css
rename to src/components/GB_Info/Disclosure/styles.module.css
diff --git a/src/app/components/GB_Info/Faq/index.tsx b/src/components/GB_Info/Faq/index.tsx
similarity index 100%
rename from src/app/components/GB_Info/Faq/index.tsx
rename to src/components/GB_Info/Faq/index.tsx
diff --git a/src/app/components/GB_Info/Faq/package.json b/src/components/GB_Info/Faq/package.json
similarity index 100%
rename from src/app/components/GB_Info/Faq/package.json
rename to src/components/GB_Info/Faq/package.json
diff --git a/src/app/components/GB_Info/Faq/styles.module.css b/src/components/GB_Info/Faq/styles.module.css
similarity index 100%
rename from src/app/components/GB_Info/Faq/styles.module.css
rename to src/components/GB_Info/Faq/styles.module.css
diff --git a/src/app/components/GB_Info/PIP/index.tsx b/src/components/GB_Info/PIP/index.tsx
similarity index 95%
rename from src/app/components/GB_Info/PIP/index.tsx
rename to src/components/GB_Info/PIP/index.tsx
index e81125b..6f17b00 100644
--- a/src/app/components/GB_Info/PIP/index.tsx
+++ b/src/components/GB_Info/PIP/index.tsx
@@ -3,7 +3,7 @@ import Head from 'next/head';
 import TypoGraphy from '@mui/material/Typography';
 import PropTypes from 'prop-types' //ES6
 import styles from './styles.module.css';
-import constants from '@/src/app/lib/constants'
+import constants from '@/src/lib/constants'
 import { useQuery, useMutation, gql } from "@apollo/client";
 
 export default function PIP(props) {
diff --git a/src/app/components/GB_Info/PIP/package.json b/src/components/GB_Info/PIP/package.json
similarity index 100%
rename from src/app/components/GB_Info/PIP/package.json
rename to src/components/GB_Info/PIP/package.json
diff --git a/src/app/components/GB_Info/PIP/styles.module.css b/src/components/GB_Info/PIP/styles.module.css
similarity index 100%
rename from src/app/components/GB_Info/PIP/styles.module.css
rename to src/components/GB_Info/PIP/styles.module.css
diff --git a/src/app/components/GB_Info/PrivacyPolicy/index.tsx b/src/components/GB_Info/PrivacyPolicy/index.tsx
similarity index 96%
rename from src/app/components/GB_Info/PrivacyPolicy/index.tsx
rename to src/components/GB_Info/PrivacyPolicy/index.tsx
index 5a07ef5..2f5a086 100644
--- a/src/app/components/GB_Info/PrivacyPolicy/index.tsx
+++ b/src/components/GB_Info/PrivacyPolicy/index.tsx
@@ -3,7 +3,7 @@ import TypoGraphy from '@mui/material/Typography';
 import Head from 'next/head';
 import PropTypes from 'prop-types' //ES6
 import styles from './styles.module.css';
-import constants from '@/src/app/lib/constants'
+import constants from '@/src/lib/constants'
 import { useQuery, useMutation, gql } from "@apollo/client";
 
 export default function PrivacyPolicy(props) {
diff --git a/src/app/components/GB_Info/PrivacyPolicy/package.json b/src/components/GB_Info/PrivacyPolicy/package.json
similarity index 100%
rename from src/app/components/GB_Info/PrivacyPolicy/package.json
rename to src/components/GB_Info/PrivacyPolicy/package.json
diff --git a/src/app/components/GB_Info/PrivacyPolicy/styles.module.css b/src/components/GB_Info/PrivacyPolicy/styles.module.css
similarity index 100%
rename from src/app/components/GB_Info/PrivacyPolicy/styles.module.css
rename to src/components/GB_Info/PrivacyPolicy/styles.module.css
diff --git a/src/app/components/GB_Info/TermsOfService/index.tsx b/src/components/GB_Info/TermsOfService/index.tsx
similarity index 95%
rename from src/app/components/GB_Info/TermsOfService/index.tsx
rename to src/components/GB_Info/TermsOfService/index.tsx
index 53ddc3b..93d137f 100644
--- a/src/app/components/GB_Info/TermsOfService/index.tsx
+++ b/src/components/GB_Info/TermsOfService/index.tsx
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import Head from 'next/head';
 import TypoGraphy from '@mui/material/Typography';
 import PropTypes from 'prop-types' //ES6
-import constants from '@/src/app/lib/constants'
+import constants from '@/src/lib/constants'
 import { useQuery, useMutation, gql } from "@apollo/client";
 
 export default function TermsOfService(props) {
diff --git a/src/app/components/GB_Info/TermsOfService/package.json b/src/components/GB_Info/TermsOfService/package.json
similarity index 100%
rename from src/app/components/GB_Info/TermsOfService/package.json
rename to src/components/GB_Info/TermsOfService/package.json
diff --git a/src/app/components/GB_Info/TermsOfService/styles.module.css b/src/components/GB_Info/TermsOfService/styles.module.css
similarity index 100%
rename from src/app/components/GB_Info/TermsOfService/styles.module.css
rename to src/components/GB_Info/TermsOfService/styles.module.css
diff --git a/src/app/components/GB_SignIn/index.tsx b/src/components/GB_SignIn/index.tsx
similarity index 100%
rename from src/app/components/GB_SignIn/index.tsx
rename to src/components/GB_SignIn/index.tsx
diff --git a/src/app/components/GB_SignIn/package.json b/src/components/GB_SignIn/package.json
similarity index 100%
rename from src/app/components/GB_SignIn/package.json
rename to src/components/GB_SignIn/package.json
diff --git a/src/app/components/GB_SignIn/styles.module.css b/src/components/GB_SignIn/styles.module.css
similarity index 100%
rename from src/app/components/GB_SignIn/styles.module.css
rename to src/components/GB_SignIn/styles.module.css
diff --git a/src/app/components/Header/Header.tsx b/src/components/Header/Header.tsx
similarity index 100%
rename from src/app/components/Header/Header.tsx
rename to src/components/Header/Header.tsx
diff --git a/src/app/components/Header/index.tsx b/src/components/Header/index.tsx
similarity index 100%
rename from src/app/components/Header/index.tsx
rename to src/components/Header/index.tsx
diff --git a/src/app/components/Hero/index.tsx b/src/components/Hero/index.tsx
similarity index 100%
rename from src/app/components/Hero/index.tsx
rename to src/components/Hero/index.tsx
diff --git a/src/app/components/HomeContent/index.tsx b/src/components/HomeContent/index.tsx
similarity index 100%
rename from src/app/components/HomeContent/index.tsx
rename to src/components/HomeContent/index.tsx
diff --git a/src/app/components/ui/accordion.tsx b/src/components/ui/accordion.tsx
similarity index 100%
rename from src/app/components/ui/accordion.tsx
rename to src/components/ui/accordion.tsx
diff --git a/src/app/components/ui/action-bar.tsx b/src/components/ui/action-bar.tsx
similarity index 100%
rename from src/app/components/ui/action-bar.tsx
rename to src/components/ui/action-bar.tsx
diff --git a/src/app/components/ui/alert.tsx b/src/components/ui/alert.tsx
similarity index 100%
rename from src/app/components/ui/alert.tsx
rename to src/components/ui/alert.tsx
diff --git a/src/app/components/ui/avatar.tsx b/src/components/ui/avatar.tsx
similarity index 100%
rename from src/app/components/ui/avatar.tsx
rename to src/components/ui/avatar.tsx
diff --git a/src/app/components/ui/blockquote.tsx b/src/components/ui/blockquote.tsx
similarity index 100%
rename from src/app/components/ui/blockquote.tsx
rename to src/components/ui/blockquote.tsx
diff --git a/src/app/components/ui/breadcrumb.tsx b/src/components/ui/breadcrumb.tsx
similarity index 100%
rename from src/app/components/ui/breadcrumb.tsx
rename to src/components/ui/breadcrumb.tsx
diff --git a/src/app/components/ui/button.tsx b/src/components/ui/button.tsx
similarity index 100%
rename from src/app/components/ui/button.tsx
rename to src/components/ui/button.tsx
diff --git a/src/app/components/ui/checkbox-card.tsx b/src/components/ui/checkbox-card.tsx
similarity index 100%
rename from src/app/components/ui/checkbox-card.tsx
rename to src/components/ui/checkbox-card.tsx
diff --git a/src/app/components/ui/checkbox.tsx b/src/components/ui/checkbox.tsx
similarity index 100%
rename from src/app/components/ui/checkbox.tsx
rename to src/components/ui/checkbox.tsx
diff --git a/src/app/components/ui/clipboard.tsx b/src/components/ui/clipboard.tsx
similarity index 100%
rename from src/app/components/ui/clipboard.tsx
rename to src/components/ui/clipboard.tsx
diff --git a/src/app/components/ui/close-button.tsx b/src/components/ui/close-button.tsx
similarity index 100%
rename from src/app/components/ui/close-button.tsx
rename to src/components/ui/close-button.tsx
diff --git a/src/app/components/ui/color-mode.tsx b/src/components/ui/color-mode.tsx
similarity index 100%
rename from src/app/components/ui/color-mode.tsx
rename to src/components/ui/color-mode.tsx
diff --git a/src/app/components/ui/data-list.tsx b/src/components/ui/data-list.tsx
similarity index 100%
rename from src/app/components/ui/data-list.tsx
rename to src/components/ui/data-list.tsx
diff --git a/src/app/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
similarity index 100%
rename from src/app/components/ui/dialog.tsx
rename to src/components/ui/dialog.tsx
diff --git a/src/app/components/ui/drawer.tsx b/src/components/ui/drawer.tsx
similarity index 100%
rename from src/app/components/ui/drawer.tsx
rename to src/components/ui/drawer.tsx
diff --git a/src/app/components/ui/empty-state.tsx b/src/components/ui/empty-state.tsx
similarity index 100%
rename from src/app/components/ui/empty-state.tsx
rename to src/components/ui/empty-state.tsx
diff --git a/src/app/components/ui/field.tsx b/src/components/ui/field.tsx
similarity index 100%
rename from src/app/components/ui/field.tsx
rename to src/components/ui/field.tsx
diff --git a/src/app/components/ui/file-button.tsx b/src/components/ui/file-button.tsx
similarity index 100%
rename from src/app/components/ui/file-button.tsx
rename to src/components/ui/file-button.tsx
diff --git a/src/app/components/ui/hover-card.tsx b/src/components/ui/hover-card.tsx
similarity index 100%
rename from src/app/components/ui/hover-card.tsx
rename to src/components/ui/hover-card.tsx
diff --git a/src/app/components/ui/input-group.tsx b/src/components/ui/input-group.tsx
similarity index 100%
rename from src/app/components/ui/input-group.tsx
rename to src/components/ui/input-group.tsx
diff --git a/src/app/components/ui/link-button.tsx b/src/components/ui/link-button.tsx
similarity index 100%
rename from src/app/components/ui/link-button.tsx
rename to src/components/ui/link-button.tsx
diff --git a/src/app/components/ui/menu.tsx b/src/components/ui/menu.tsx
similarity index 100%
rename from src/app/components/ui/menu.tsx
rename to src/components/ui/menu.tsx
diff --git a/src/app/components/ui/native-select.tsx b/src/components/ui/native-select.tsx
similarity index 100%
rename from src/app/components/ui/native-select.tsx
rename to src/components/ui/native-select.tsx
diff --git a/src/app/components/ui/number-input.tsx b/src/components/ui/number-input.tsx
similarity index 100%
rename from src/app/components/ui/number-input.tsx
rename to src/components/ui/number-input.tsx
diff --git a/src/app/components/ui/pagination.tsx b/src/components/ui/pagination.tsx
similarity index 100%
rename from src/app/components/ui/pagination.tsx
rename to src/components/ui/pagination.tsx
diff --git a/src/app/components/ui/password-input.tsx b/src/components/ui/password-input.tsx
similarity index 100%
rename from src/app/components/ui/password-input.tsx
rename to src/components/ui/password-input.tsx
diff --git a/src/app/components/ui/pin-input.tsx b/src/components/ui/pin-input.tsx
similarity index 100%
rename from src/app/components/ui/pin-input.tsx
rename to src/components/ui/pin-input.tsx
diff --git a/src/app/components/ui/popover.tsx b/src/components/ui/popover.tsx
similarity index 100%
rename from src/app/components/ui/popover.tsx
rename to src/components/ui/popover.tsx
diff --git a/src/app/components/ui/progress-circle.tsx b/src/components/ui/progress-circle.tsx
similarity index 100%
rename from src/app/components/ui/progress-circle.tsx
rename to src/components/ui/progress-circle.tsx
diff --git a/src/app/components/ui/progress.tsx b/src/components/ui/progress.tsx
similarity index 100%
rename from src/app/components/ui/progress.tsx
rename to src/components/ui/progress.tsx
diff --git a/src/app/components/ui/prose.tsx b/src/components/ui/prose.tsx
similarity index 100%
rename from src/app/components/ui/prose.tsx
rename to src/components/ui/prose.tsx
diff --git a/src/app/components/ui/provider.tsx b/src/components/ui/provider.tsx
similarity index 100%
rename from src/app/components/ui/provider.tsx
rename to src/components/ui/provider.tsx
diff --git a/src/app/components/ui/radio-card.tsx b/src/components/ui/radio-card.tsx
similarity index 100%
rename from src/app/components/ui/radio-card.tsx
rename to src/components/ui/radio-card.tsx
diff --git a/src/app/components/ui/radio.tsx b/src/components/ui/radio.tsx
similarity index 100%
rename from src/app/components/ui/radio.tsx
rename to src/components/ui/radio.tsx
diff --git a/src/app/components/ui/rating.tsx b/src/components/ui/rating.tsx
similarity index 100%
rename from src/app/components/ui/rating.tsx
rename to src/components/ui/rating.tsx
diff --git a/src/app/components/ui/segmented-control.tsx b/src/components/ui/segmented-control.tsx
similarity index 100%
rename from src/app/components/ui/segmented-control.tsx
rename to src/components/ui/segmented-control.tsx
diff --git a/src/app/components/ui/select.tsx b/src/components/ui/select.tsx
similarity index 100%
rename from src/app/components/ui/select.tsx
rename to src/components/ui/select.tsx
diff --git a/src/app/components/ui/skeleton.tsx b/src/components/ui/skeleton.tsx
similarity index 100%
rename from src/app/components/ui/skeleton.tsx
rename to src/components/ui/skeleton.tsx
diff --git a/src/app/components/ui/slider.tsx b/src/components/ui/slider.tsx
similarity index 100%
rename from src/app/components/ui/slider.tsx
rename to src/components/ui/slider.tsx
diff --git a/src/app/components/ui/stat.tsx b/src/components/ui/stat.tsx
similarity index 100%
rename from src/app/components/ui/stat.tsx
rename to src/components/ui/stat.tsx
diff --git a/src/app/components/ui/status.tsx b/src/components/ui/status.tsx
similarity index 100%
rename from src/app/components/ui/status.tsx
rename to src/components/ui/status.tsx
diff --git a/src/app/components/ui/stepper-input.tsx b/src/components/ui/stepper-input.tsx
similarity index 100%
rename from src/app/components/ui/stepper-input.tsx
rename to src/components/ui/stepper-input.tsx
diff --git a/src/app/components/ui/steps.tsx b/src/components/ui/steps.tsx
similarity index 100%
rename from src/app/components/ui/steps.tsx
rename to src/components/ui/steps.tsx
diff --git a/src/app/components/ui/switch.tsx b/src/components/ui/switch.tsx
similarity index 100%
rename from src/app/components/ui/switch.tsx
rename to src/components/ui/switch.tsx
diff --git a/src/app/components/ui/tag.tsx b/src/components/ui/tag.tsx
similarity index 100%
rename from src/app/components/ui/tag.tsx
rename to src/components/ui/tag.tsx
diff --git a/src/app/components/ui/timeline.tsx b/src/components/ui/timeline.tsx
similarity index 100%
rename from src/app/components/ui/timeline.tsx
rename to src/components/ui/timeline.tsx
diff --git a/src/app/components/ui/toaster.tsx b/src/components/ui/toaster.tsx
similarity index 100%
rename from src/app/components/ui/toaster.tsx
rename to src/components/ui/toaster.tsx
diff --git a/src/app/components/ui/toggle-tip.tsx b/src/components/ui/toggle-tip.tsx
similarity index 100%
rename from src/app/components/ui/toggle-tip.tsx
rename to src/components/ui/toggle-tip.tsx
diff --git a/src/app/components/ui/toggle.tsx b/src/components/ui/toggle.tsx
similarity index 100%
rename from src/app/components/ui/toggle.tsx
rename to src/components/ui/toggle.tsx
diff --git a/src/app/components/ui/tooltip.tsx b/src/components/ui/tooltip.tsx
similarity index 100%
rename from src/app/components/ui/tooltip.tsx
rename to src/components/ui/tooltip.tsx
diff --git a/src/app/lib/client.ts b/src/lib/client.ts
similarity index 100%
rename from src/app/lib/client.ts
rename to src/lib/client.ts
diff --git a/src/app/lib/constants.ts b/src/lib/constants.ts
similarity index 100%
rename from src/app/lib/constants.ts
rename to src/lib/constants.ts
diff --git a/src/app/lib/linkList/infoLinks.js b/src/lib/linkList/infoLinks.js
similarity index 100%
rename from src/app/lib/linkList/infoLinks.js
rename to src/lib/linkList/infoLinks.js
diff --git a/src/app/lib/linkList/sectionLinks.js b/src/lib/linkList/sectionLinks.js
similarity index 89%
rename from src/app/lib/linkList/sectionLinks.js
rename to src/lib/linkList/sectionLinks.js
index 1842770..e21f31e 100644
--- a/src/app/lib/linkList/sectionLinks.js
+++ b/src/lib/linkList/sectionLinks.js
@@ -51,13 +51,13 @@ export const sectionLinks = {
     }
 };
 
-export const armoryLinks = [
-    {UPPERS: {
-        URL: "/products/rifleuppers",
-        TEXT: "Rifle Uppers",
-        TIP: "Rifle Uppers"
+export const armoryLinks = new Array(
+    {"UPPERS": {
+        "URL": "/products/rifleuppers",
+        "TEXT": "Rifle Uppers",
+        "TIP": "Rifle Uppers"
     }},
-    {LOWERS: {
+    {"LOWERS": {
         URL: "/products/lowers",
         TEXT: "Lowers",
         TIP: "Lowers" 
@@ -81,6 +81,7 @@ export const armoryLinks = [
         URL: "/products/accessories",
         TEXT: "Accessories",
         TIP: "Accessories"
-    }}];
+    }}
+);
 
 export default sectionLinks;
\ No newline at end of file
diff --git a/src/app/lib/script.ts b/src/lib/script.ts
similarity index 100%
rename from src/app/lib/script.ts
rename to src/lib/script.ts
diff --git a/src/app/pages/api/products.js b/src/pages/api/products.js
similarity index 100%
rename from src/app/pages/api/products.js
rename to src/pages/api/products.js
diff --git a/src/app/pages/builder.js b/src/pages/builder.js
similarity index 100%
rename from src/app/pages/builder.js
rename to src/pages/builder.js
diff --git a/src/app/pages/oldindex.js b/src/pages/oldindex.js
similarity index 100%
rename from src/app/pages/oldindex.js
rename to src/pages/oldindex.js
diff --git a/src/app/pages/page-orig.tsx b/src/pages/page-orig.tsx
similarity index 100%
rename from src/app/pages/page-orig.tsx
rename to src/pages/page-orig.tsx
diff --git a/src/app/pages/products.js b/src/pages/products.js
similarity index 100%
rename from src/app/pages/products.js
rename to src/pages/products.js
diff --git a/src/app/globals.css b/src/styles/globals.css
similarity index 100%
rename from src/app/globals.css
rename to src/styles/globals.css
diff --git a/tsconfig.json b/tsconfig.json
index a45c9bd..8d33018 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,26 +21,26 @@
     ],
     "paths": {
       "@/*": ["./*"],
-      "@/components/*": [
+      "components/*": [
         "/src/app/components/*"
       ],
-      "@/layouts/*": [
-        "src/app/components/layouts/*"
+      "layouts/*": [
+        "/src/app/components/layouts/*"
       ],
-      "@/fragments/*": [
-        "src/app/Fragments/*"
+      "fragments/*": [
+        "/src/app/Fragments/*"
       ],
-      "@/lib/*": [
-        "src/app/lib/*"
+      "lib/*": [
+        "/src/app/lib/*"
       ],
-      "@/scss/*": [
-        "./scss/*"
+      "scss/*": [
+        "./src/scss/*"
       ],
-      "@/admin/*": [
-        "src/app/components/Admin/*"
+      "admin/*": [
+        "src/components/Admin/*"
       ],
-      "@/products/*": [
-        "src/app/components/Products/*"
+      "products/*": [
+        "src/components/Products/*"
       ]
     },