diff --git a/app/Fragments/Armory/index.tsx b/src/app/Fragments/Armory/index.tsx
similarity index 100%
rename from app/Fragments/Armory/index.tsx
rename to src/app/Fragments/Armory/index.tsx
diff --git a/app/Fragments/Armory/package.json b/src/app/Fragments/Armory/package.json
similarity index 100%
rename from app/Fragments/Armory/package.json
rename to src/app/Fragments/Armory/package.json
diff --git a/app/Fragments/Armory/style.module.scss b/src/app/Fragments/Armory/style.module.scss
similarity index 100%
rename from app/Fragments/Armory/style.module.scss
rename to src/app/Fragments/Armory/style.module.scss
diff --git a/app/Fragments/Button/index.js b/src/app/Fragments/Button/index.js
similarity index 100%
rename from app/Fragments/Button/index.js
rename to src/app/Fragments/Button/index.js
diff --git a/app/Fragments/Button/package.json b/src/app/Fragments/Button/package.json
similarity index 100%
rename from app/Fragments/Button/package.json
rename to src/app/Fragments/Button/package.json
diff --git a/app/Fragments/Button/style.module.scss b/src/app/Fragments/Button/style.module.scss
similarity index 100%
rename from app/Fragments/Button/style.module.scss
rename to src/app/Fragments/Button/style.module.scss
diff --git a/app/Fragments/DSTPageHeader/index.js b/src/app/Fragments/DSTPageHeader/index.js
similarity index 100%
rename from app/Fragments/DSTPageHeader/index.js
rename to src/app/Fragments/DSTPageHeader/index.js
diff --git a/app/Fragments/DSTPageHeader/package.json b/src/app/Fragments/DSTPageHeader/package.json
similarity index 100%
rename from app/Fragments/DSTPageHeader/package.json
rename to src/app/Fragments/DSTPageHeader/package.json
diff --git a/app/Fragments/DSTPageHeader/styles.module.css b/src/app/Fragments/DSTPageHeader/styles.module.css
similarity index 100%
rename from app/Fragments/DSTPageHeader/styles.module.css
rename to src/app/Fragments/DSTPageHeader/styles.module.css
diff --git a/app/Fragments/Error/index.js b/src/app/Fragments/Error/index.js
similarity index 100%
rename from app/Fragments/Error/index.js
rename to src/app/Fragments/Error/index.js
diff --git a/app/Fragments/Error/package.json b/src/app/Fragments/Error/package.json
similarity index 100%
rename from app/Fragments/Error/package.json
rename to src/app/Fragments/Error/package.json
diff --git a/app/Fragments/Error/style.module.css b/src/app/Fragments/Error/style.module.css
similarity index 100%
rename from app/Fragments/Error/style.module.css
rename to src/app/Fragments/Error/style.module.css
diff --git a/app/Fragments/FooterLink/index.tsx b/src/app/Fragments/FooterLink/index.tsx
similarity index 100%
rename from app/Fragments/FooterLink/index.tsx
rename to src/app/Fragments/FooterLink/index.tsx
diff --git a/app/Fragments/FooterLink/package.json b/src/app/Fragments/FooterLink/package.json
similarity index 100%
rename from app/Fragments/FooterLink/package.json
rename to src/app/Fragments/FooterLink/package.json
diff --git a/app/Fragments/FooterLink/styles.module.css b/src/app/Fragments/FooterLink/styles.module.css
similarity index 100%
rename from app/Fragments/FooterLink/styles.module.css
rename to src/app/Fragments/FooterLink/styles.module.css
diff --git a/app/Fragments/GroundZero/index.tsx b/src/app/Fragments/GroundZero/index.tsx
similarity index 100%
rename from app/Fragments/GroundZero/index.tsx
rename to src/app/Fragments/GroundZero/index.tsx
diff --git a/app/Fragments/GroundZero/package.json b/src/app/Fragments/GroundZero/package.json
similarity index 100%
rename from app/Fragments/GroundZero/package.json
rename to src/app/Fragments/GroundZero/package.json
diff --git a/app/Fragments/GroundZero/style.module.scss b/src/app/Fragments/GroundZero/style.module.scss
similarity index 100%
rename from app/Fragments/GroundZero/style.module.scss
rename to src/app/Fragments/GroundZero/style.module.scss
diff --git a/app/Fragments/Information/index.tsx b/src/app/Fragments/Information/index.tsx
similarity index 100%
rename from app/Fragments/Information/index.tsx
rename to src/app/Fragments/Information/index.tsx
diff --git a/app/Fragments/Information/package.json b/src/app/Fragments/Information/package.json
similarity index 100%
rename from app/Fragments/Information/package.json
rename to src/app/Fragments/Information/package.json
diff --git a/app/Fragments/Information/style.module.scss b/src/app/Fragments/Information/style.module.scss
similarity index 100%
rename from app/Fragments/Information/style.module.scss
rename to src/app/Fragments/Information/style.module.scss
diff --git a/app/Fragments/States/index.tsx b/src/app/Fragments/States/index.tsx
similarity index 100%
rename from app/Fragments/States/index.tsx
rename to src/app/Fragments/States/index.tsx
diff --git a/app/components/About/index.tsx b/src/app/components/About/index.tsx
similarity index 100%
rename from app/components/About/index.tsx
rename to src/app/components/About/index.tsx
diff --git a/app/components/Base_Component/index.tsx b/src/app/components/Base_Component/index.tsx
similarity index 100%
rename from app/components/Base_Component/index.tsx
rename to src/app/components/Base_Component/index.tsx
diff --git a/app/components/Contact/index.tsx b/src/app/components/Contact/index.tsx
similarity index 100%
rename from app/components/Contact/index.tsx
rename to src/app/components/Contact/index.tsx
diff --git a/app/components/FeaturesSection/index.tsx b/src/app/components/FeaturesSection/index.tsx
similarity index 100%
rename from app/components/FeaturesSection/index.tsx
rename to src/app/components/FeaturesSection/index.tsx
diff --git a/app/components/Footer /index.tsx b/src/app/components/Footer /index.tsx
similarity index 100%
rename from app/components/Footer /index.tsx
rename to src/app/components/Footer /index.tsx
diff --git a/app/components/GB_Footer/FooterLinks/index copy.js b/src/app/components/GB_Footer/FooterLinks/index copy.js
similarity index 100%
rename from app/components/GB_Footer/FooterLinks/index copy.js
rename to src/app/components/GB_Footer/FooterLinks/index copy.js
diff --git a/app/components/GB_Footer/FooterLinks/index.js b/src/app/components/GB_Footer/FooterLinks/index.js
similarity index 96%
rename from app/components/GB_Footer/FooterLinks/index.js
rename to src/app/components/GB_Footer/FooterLinks/index.js
index 27dde9f..85bbd28 100644
--- a/app/components/GB_Footer/FooterLinks/index.js
+++ b/src/app/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 '@/app/Fragments/FooterLink';
+import FooterLink from '@/src/app/Fragments/FooterLink';
 
 
 class FooterLinks extends React.Component {
diff --git a/app/components/GB_Footer/FooterLinks/package.json b/src/app/components/GB_Footer/FooterLinks/package.json
similarity index 100%
rename from app/components/GB_Footer/FooterLinks/package.json
rename to src/app/components/GB_Footer/FooterLinks/package.json
diff --git a/app/components/GB_Footer/FooterLinks/styles.module.css b/src/app/components/GB_Footer/FooterLinks/styles.module.css
similarity index 100%
rename from app/components/GB_Footer/FooterLinks/styles.module.css
rename to src/app/components/GB_Footer/FooterLinks/styles.module.css
diff --git a/app/components/GB_Footer/index.tsx b/src/app/components/GB_Footer/index.tsx
similarity index 72%
rename from app/components/GB_Footer/index.tsx
rename to src/app/components/GB_Footer/index.tsx
index 48e8079..9b98635 100644
--- a/app/components/GB_Footer/index.tsx
+++ b/src/app/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 "@/app/components/GB_Info/Copyright";
+import Copyright from "@/src/app/components/GB_Info/Copyright";
 import FooterLinks from "./FooterLinks";
 import Link from "next/link";
-import { infoLinks } from "@/app/lib/linkList/infoLinks";
-import { sectionLinks } from "@/app/lib/linkList/sectionLinks";
-import Armory from '@/app/Fragments/Armory';
-import GroundZero from "@/app/Fragments/GroundZero";
-import Information from "@/app/Fragments/Information";
+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";
 export const Footer = () => {
 
   return (
diff --git a/app/components/GB_Footer/package.json b/src/app/components/GB_Footer/package.json
similarity index 100%
rename from app/components/GB_Footer/package.json
rename to src/app/components/GB_Footer/package.json
diff --git a/app/components/GB_Footer/styles.module.scss b/src/app/components/GB_Footer/styles.module.scss
similarity index 100%
rename from app/components/GB_Footer/styles.module.scss
rename to src/app/components/GB_Footer/styles.module.scss
diff --git a/app/components/GB_Header/index.tsx b/src/app/components/GB_Header/index.tsx
similarity index 100%
rename from app/components/GB_Header/index.tsx
rename to src/app/components/GB_Header/index.tsx
diff --git a/app/components/GB_Header/package.json b/src/app/components/GB_Header/package.json
similarity index 100%
rename from app/components/GB_Header/package.json
rename to src/app/components/GB_Header/package.json
diff --git a/app/components/GB_Header/styles.module.css b/src/app/components/GB_Header/styles.module.css
similarity index 100%
rename from app/components/GB_Header/styles.module.css
rename to src/app/components/GB_Header/styles.module.css
diff --git a/app/components/GB_Hero/index.tsx b/src/app/components/GB_Hero/index.tsx
similarity index 100%
rename from app/components/GB_Hero/index.tsx
rename to src/app/components/GB_Hero/index.tsx
diff --git a/app/components/GB_Hero/package.json b/src/app/components/GB_Hero/package.json
similarity index 100%
rename from app/components/GB_Hero/package.json
rename to src/app/components/GB_Hero/package.json
diff --git a/app/components/GB_Hero/styles.module.css b/src/app/components/GB_Hero/styles.module.css
similarity index 100%
rename from app/components/GB_Hero/styles.module.css
rename to src/app/components/GB_Hero/styles.module.css
diff --git a/app/components/GB_Info/About/index.tsx b/src/app/components/GB_Info/About/index.tsx
similarity index 100%
rename from app/components/GB_Info/About/index.tsx
rename to src/app/components/GB_Info/About/index.tsx
diff --git a/app/components/GB_Info/About/package.json b/src/app/components/GB_Info/About/package.json
similarity index 100%
rename from app/components/GB_Info/About/package.json
rename to src/app/components/GB_Info/About/package.json
diff --git a/app/components/GB_Info/About/styles.module.css b/src/app/components/GB_Info/About/styles.module.css
similarity index 100%
rename from app/components/GB_Info/About/styles.module.css
rename to src/app/components/GB_Info/About/styles.module.css
diff --git a/app/components/GB_Info/ContactUs/index.tsx b/src/app/components/GB_Info/ContactUs/index.tsx
similarity index 95%
rename from app/components/GB_Info/ContactUs/index.tsx
rename to src/app/components/GB_Info/ContactUs/index.tsx
index 25a75b0..1198a76 100644
--- a/app/components/GB_Info/ContactUs/index.tsx
+++ b/src/app/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 '@/app/lib/constants'
+import constants from '@/src/app/lib/constants'
 
 import { useQuery, useMutation, gql } from "@apollo/client";
 
diff --git a/app/components/GB_Info/ContactUs/package.json b/src/app/components/GB_Info/ContactUs/package.json
similarity index 100%
rename from app/components/GB_Info/ContactUs/package.json
rename to src/app/components/GB_Info/ContactUs/package.json
diff --git a/app/components/GB_Info/ContactUs/styles.module.css b/src/app/components/GB_Info/ContactUs/styles.module.css
similarity index 100%
rename from app/components/GB_Info/ContactUs/styles.module.css
rename to src/app/components/GB_Info/ContactUs/styles.module.css
diff --git a/app/components/GB_Info/Copyright/index.tsx b/src/app/components/GB_Info/Copyright/index.tsx
similarity index 92%
rename from app/components/GB_Info/Copyright/index.tsx
rename to src/app/components/GB_Info/Copyright/index.tsx
index 8bb59ea..5240e47 100644
--- a/app/components/GB_Info/Copyright/index.tsx
+++ b/src/app/components/GB_Info/Copyright/index.tsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { COMPANY_NAME, COMPANY_URL } from '@/app/lib/constants';
+import { COMPANY_NAME, COMPANY_URL } from '@/src/app/lib/constants';
 import Typography from '@mui/material/Typography';
 import MuiLink from '@mui/material/Link';
 import styles from './styles.module.css'
diff --git a/app/components/GB_Info/Copyright/package.json b/src/app/components/GB_Info/Copyright/package.json
similarity index 100%
rename from app/components/GB_Info/Copyright/package.json
rename to src/app/components/GB_Info/Copyright/package.json
diff --git a/app/components/GB_Info/Copyright/styles.module.css b/src/app/components/GB_Info/Copyright/styles.module.css
similarity index 100%
rename from app/components/GB_Info/Copyright/styles.module.css
rename to src/app/components/GB_Info/Copyright/styles.module.css
diff --git a/app/components/GB_Info/Disclosure/index.tsx b/src/app/components/GB_Info/Disclosure/index.tsx
similarity index 96%
rename from app/components/GB_Info/Disclosure/index.tsx
rename to src/app/components/GB_Info/Disclosure/index.tsx
index fa665cf..c4eac88 100644
--- a/app/components/GB_Info/Disclosure/index.tsx
+++ b/src/app/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 '@/app/lib/constants'
-import {SITE_CONT_TYPE} from '@/app/lib/constants'
+import constants from '@/src/app/lib/constants'
+import {SITE_CONT_TYPE} from '@/src/app/lib/constants'
 import { useQuery, useMutation, gql } from "@apollo/client";
 
 export default function Disclosure(props) {
diff --git a/app/components/GB_Info/Disclosure/package.json b/src/app/components/GB_Info/Disclosure/package.json
similarity index 100%
rename from app/components/GB_Info/Disclosure/package.json
rename to src/app/components/GB_Info/Disclosure/package.json
diff --git a/app/components/GB_Info/Disclosure/styles.module.css b/src/app/components/GB_Info/Disclosure/styles.module.css
similarity index 100%
rename from app/components/GB_Info/Disclosure/styles.module.css
rename to src/app/components/GB_Info/Disclosure/styles.module.css
diff --git a/app/components/GB_Info/Faq/index.tsx b/src/app/components/GB_Info/Faq/index.tsx
similarity index 100%
rename from app/components/GB_Info/Faq/index.tsx
rename to src/app/components/GB_Info/Faq/index.tsx
diff --git a/app/components/GB_Info/Faq/package.json b/src/app/components/GB_Info/Faq/package.json
similarity index 100%
rename from app/components/GB_Info/Faq/package.json
rename to src/app/components/GB_Info/Faq/package.json
diff --git a/app/components/GB_Info/Faq/styles.module.css b/src/app/components/GB_Info/Faq/styles.module.css
similarity index 100%
rename from app/components/GB_Info/Faq/styles.module.css
rename to src/app/components/GB_Info/Faq/styles.module.css
diff --git a/app/components/GB_Info/PIP/index.tsx b/src/app/components/GB_Info/PIP/index.tsx
similarity index 95%
rename from app/components/GB_Info/PIP/index.tsx
rename to src/app/components/GB_Info/PIP/index.tsx
index 2ed2a0b..e81125b 100644
--- a/app/components/GB_Info/PIP/index.tsx
+++ b/src/app/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 '@/app/lib/constants'
+import constants from '@/src/app/lib/constants'
 import { useQuery, useMutation, gql } from "@apollo/client";
 
 export default function PIP(props) {
diff --git a/app/components/GB_Info/PIP/package.json b/src/app/components/GB_Info/PIP/package.json
similarity index 100%
rename from app/components/GB_Info/PIP/package.json
rename to src/app/components/GB_Info/PIP/package.json
diff --git a/app/components/GB_Info/PIP/styles.module.css b/src/app/components/GB_Info/PIP/styles.module.css
similarity index 100%
rename from app/components/GB_Info/PIP/styles.module.css
rename to src/app/components/GB_Info/PIP/styles.module.css
diff --git a/app/components/GB_Info/PrivacyPolicy/index.tsx b/src/app/components/GB_Info/PrivacyPolicy/index.tsx
similarity index 96%
rename from app/components/GB_Info/PrivacyPolicy/index.tsx
rename to src/app/components/GB_Info/PrivacyPolicy/index.tsx
index de78f16..5a07ef5 100644
--- a/app/components/GB_Info/PrivacyPolicy/index.tsx
+++ b/src/app/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 '@/app/lib/constants'
+import constants from '@/src/app/lib/constants'
 import { useQuery, useMutation, gql } from "@apollo/client";
 
 export default function PrivacyPolicy(props) {
diff --git a/app/components/GB_Info/PrivacyPolicy/package.json b/src/app/components/GB_Info/PrivacyPolicy/package.json
similarity index 100%
rename from app/components/GB_Info/PrivacyPolicy/package.json
rename to src/app/components/GB_Info/PrivacyPolicy/package.json
diff --git a/app/components/GB_Info/PrivacyPolicy/styles.module.css b/src/app/components/GB_Info/PrivacyPolicy/styles.module.css
similarity index 100%
rename from app/components/GB_Info/PrivacyPolicy/styles.module.css
rename to src/app/components/GB_Info/PrivacyPolicy/styles.module.css
diff --git a/app/components/GB_Info/TermsOfService/index.tsx b/src/app/components/GB_Info/TermsOfService/index.tsx
similarity index 95%
rename from app/components/GB_Info/TermsOfService/index.tsx
rename to src/app/components/GB_Info/TermsOfService/index.tsx
index 68b3951..53ddc3b 100644
--- a/app/components/GB_Info/TermsOfService/index.tsx
+++ b/src/app/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 '@/app/lib/constants'
+import constants from '@/src/app/lib/constants'
 import { useQuery, useMutation, gql } from "@apollo/client";
 
 export default function TermsOfService(props) {
diff --git a/app/components/GB_Info/TermsOfService/package.json b/src/app/components/GB_Info/TermsOfService/package.json
similarity index 100%
rename from app/components/GB_Info/TermsOfService/package.json
rename to src/app/components/GB_Info/TermsOfService/package.json
diff --git a/app/components/GB_Info/TermsOfService/styles.module.css b/src/app/components/GB_Info/TermsOfService/styles.module.css
similarity index 100%
rename from app/components/GB_Info/TermsOfService/styles.module.css
rename to src/app/components/GB_Info/TermsOfService/styles.module.css
diff --git a/app/components/GB_SignIn/index.tsx b/src/app/components/GB_SignIn/index.tsx
similarity index 100%
rename from app/components/GB_SignIn/index.tsx
rename to src/app/components/GB_SignIn/index.tsx
diff --git a/app/components/GB_SignIn/package.json b/src/app/components/GB_SignIn/package.json
similarity index 100%
rename from app/components/GB_SignIn/package.json
rename to src/app/components/GB_SignIn/package.json
diff --git a/app/components/GB_SignIn/styles.module.css b/src/app/components/GB_SignIn/styles.module.css
similarity index 100%
rename from app/components/GB_SignIn/styles.module.css
rename to src/app/components/GB_SignIn/styles.module.css
diff --git a/app/components/Header/index.tsx b/src/app/components/Header/index.tsx
similarity index 100%
rename from app/components/Header/index.tsx
rename to src/app/components/Header/index.tsx
diff --git a/app/components/Hero/index.tsx b/src/app/components/Hero/index.tsx
similarity index 100%
rename from app/components/Hero/index.tsx
rename to src/app/components/Hero/index.tsx
diff --git a/app/components/HomeContent/index.tsx b/src/app/components/HomeContent/index.tsx
similarity index 100%
rename from app/components/HomeContent/index.tsx
rename to src/app/components/HomeContent/index.tsx
diff --git a/app/favicon.ico b/src/app/favicon.ico
similarity index 100%
rename from app/favicon.ico
rename to src/app/favicon.ico
diff --git a/app/fonts/GeistMonoVF.woff b/src/app/fonts/GeistMonoVF.woff
similarity index 100%
rename from app/fonts/GeistMonoVF.woff
rename to src/app/fonts/GeistMonoVF.woff
diff --git a/app/fonts/GeistVF.woff b/src/app/fonts/GeistVF.woff
similarity index 100%
rename from app/fonts/GeistVF.woff
rename to src/app/fonts/GeistVF.woff
diff --git a/app/globals.css b/src/app/globals.css
similarity index 100%
rename from app/globals.css
rename to src/app/globals.css
diff --git a/app/layout.tsx b/src/app/layout.tsx
similarity index 100%
rename from app/layout.tsx
rename to src/app/layout.tsx
diff --git a/app/lib/client.ts b/src/app/lib/client.ts
similarity index 100%
rename from app/lib/client.ts
rename to src/app/lib/client.ts
diff --git a/app/lib/constants.ts b/src/app/lib/constants.ts
similarity index 100%
rename from app/lib/constants.ts
rename to src/app/lib/constants.ts
diff --git a/app/lib/linkList/infoLinks.js b/src/app/lib/linkList/infoLinks.js
similarity index 100%
rename from app/lib/linkList/infoLinks.js
rename to src/app/lib/linkList/infoLinks.js
diff --git a/app/lib/linkList/sectionLinks.js b/src/app/lib/linkList/sectionLinks.js
similarity index 100%
rename from app/lib/linkList/sectionLinks.js
rename to src/app/lib/linkList/sectionLinks.js
diff --git a/app/lib/script.ts b/src/app/lib/script.ts
similarity index 100%
rename from app/lib/script.ts
rename to src/app/lib/script.ts
diff --git a/app/page.tsx b/src/app/page.tsx
similarity index 100%
rename from app/page.tsx
rename to src/app/page.tsx
diff --git a/pages/api/products.js b/src/app/pages/api/products.js
similarity index 100%
rename from pages/api/products.js
rename to src/app/pages/api/products.js
diff --git a/pages/builder.js b/src/app/pages/builder.js
similarity index 100%
rename from pages/builder.js
rename to src/app/pages/builder.js
diff --git a/pages/oldindex.js b/src/app/pages/oldindex.js
similarity index 100%
rename from pages/oldindex.js
rename to src/app/pages/oldindex.js
diff --git a/app/page-orig.tsx b/src/app/pages/page-orig.tsx
similarity index 100%
rename from app/page-orig.tsx
rename to src/app/pages/page-orig.tsx
diff --git a/pages/products.js b/src/app/pages/products.js
similarity index 100%
rename from pages/products.js
rename to src/app/pages/products.js
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 1362b88..109807b 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -2,9 +2,9 @@ import type { Config } from "tailwindcss";
 
 export default {
   content: [
-    "./pages/**/*.{js,ts,jsx,tsx,mdx}",
-    "./components/**/*.{js,ts,jsx,tsx,mdx}",
-    "./app/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
   ],
   theme: {
     extend: {
diff --git a/tsconfig.json b/tsconfig.json
index 0696bdd..a45c9bd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,6 +13,7 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
+    "baseUrl": ".",
     "plugins": [
       {
         "name": "next"
@@ -21,25 +22,25 @@
     "paths": {
       "@/*": ["./*"],
       "@/components/*": [
-        "./app/components/*"
+        "/src/app/components/*"
       ],
       "@/layouts/*": [
-        "./app/components/layouts/*"
+        "src/app/components/layouts/*"
       ],
       "@/fragments/*": [
-        "./app/Fragments/*"
+        "src/app/Fragments/*"
       ],
       "@/lib/*": [
-        "./app/lib/*"
+        "src/app/lib/*"
       ],
       "@/scss/*": [
         "./scss/*"
       ],
       "@/admin/*": [
-        "./app/components/Admin/*"
+        "src/app/components/Admin/*"
       ],
       "@/products/*": [
-        "./app/components/Products/*"
+        "src/app/components/Products/*"
       ]
     },