diff --git a/app/apple-icon.png b/src/app/apple-icon.png
similarity index 100%
rename from app/apple-icon.png
rename to src/app/apple-icon.png
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/icon.png b/src/app/icon.png
similarity index 100%
rename from app/icon.png
rename to src/app/icon.png
diff --git a/app/layout.jsx b/src/app/layout.jsx
similarity index 91%
rename from app/layout.jsx
rename to src/app/layout.jsx
index 6ba8327..d47408b 100644
--- a/app/layout.jsx
+++ b/src/app/layout.jsx
@@ -17,8 +17,8 @@
 import "bootstrap/dist/css/bootstrap.min.css";
 import React from "react";
 //* Local Imports
-import { getMetadata } from "./_logic/metadata/service";
-import StateManager from "./_logic/state/manager";
+import { getMetadata } from "../logic/metadata/service";
+import StateManager from "../logic/state/manager";
 
 
 //* Main
diff --git a/app/layout.test.jsx b/src/app/layout.test.jsx
similarity index 96%
rename from app/layout.test.jsx
rename to src/app/layout.test.jsx
index 8759433..5714bf5 100644
--- a/app/layout.test.jsx
+++ b/src/app/layout.test.jsx
@@ -29,7 +29,7 @@ vi.mock("@inrupt/solid-ui-react", () => ({
 }));
 
 // Mocking the getMetadata function
-vi.mock("./_logic/metadata/service", () => ({
+vi.mock("./logic/metadata/service", () => ({
     getMetadata: vi.fn().mockResolvedValue({ /* mock metadata object */ })
 }));
 
diff --git a/app/not-found.jsx b/src/app/not-found.jsx
similarity index 100%
rename from app/not-found.jsx
rename to src/app/not-found.jsx
diff --git a/app/opengraph-image.png b/src/app/opengraph-image.png
similarity index 100%
rename from app/opengraph-image.png
rename to src/app/opengraph-image.png
diff --git a/app/page.css b/src/app/page.css
similarity index 100%
rename from app/page.css
rename to src/app/page.css
diff --git a/app/page.jsx b/src/app/page.jsx
similarity index 89%
rename from app/page.jsx
rename to src/app/page.jsx
index 8917cc8..5a9022c 100644
--- a/app/page.jsx
+++ b/src/app/page.jsx
@@ -17,8 +17,8 @@
 import React from "react";
 //* Local Imports
 import "./page.css";
-import Footer from "./_components/molecules/footer/component";
-import AuthButton from "./_components/atoms/authButton";
+import Footer from "../components/molecules/footer/component";
+import AuthButton from "../components/atoms/authButton";
 
 
 //* Main
diff --git a/app/twitter-image.png b/src/app/twitter-image.png
similarity index 100%
rename from app/twitter-image.png
rename to src/app/twitter-image.png
diff --git a/app/_components/atoms/authButton.jsx b/src/components/atoms/authButton.jsx
similarity index 100%
rename from app/_components/atoms/authButton.jsx
rename to src/components/atoms/authButton.jsx
diff --git a/app/_components/atoms/loginButton.jsx b/src/components/atoms/loginButton.jsx
similarity index 95%
rename from app/_components/atoms/loginButton.jsx
rename to src/components/atoms/loginButton.jsx
index 86c1097..ababb29 100644
--- a/app/_components/atoms/loginButton.jsx
+++ b/src/components/atoms/loginButton.jsx
@@ -20,7 +20,7 @@ import React, { useEffect, useState } from "react";
 import { LoginButton as SolidLoginButton } from "@inrupt/solid-ui-react";
 import { Button } from "react-bootstrap";
 //* Local imports
-import { getOptions } from "../../_logic/auth/service";
+import { getOptions } from "../../logic/auth/service";
 
 
 //* Main
diff --git a/app/_components/atoms/logoutButton.jsx b/src/components/atoms/logoutButton.jsx
similarity index 100%
rename from app/_components/atoms/logoutButton.jsx
rename to src/components/atoms/logoutButton.jsx
diff --git a/app/_components/molecules/footer/component.jsx b/src/components/molecules/footer/component.jsx
similarity index 96%
rename from app/_components/molecules/footer/component.jsx
rename to src/components/molecules/footer/component.jsx
index cbdcfce..ccbd434 100644
--- a/app/_components/molecules/footer/component.jsx
+++ b/src/components/molecules/footer/component.jsx
@@ -18,7 +18,7 @@
 //* Imports
 import Link from "next/link";
 //* Local Imports
-import useData from "../../../_logic/data/hook";
+import useData from "../../../logic/data/hook";
 import FooterLayout from "./layout";
 
 
diff --git a/app/_components/molecules/footer/layout.jsx b/src/components/molecules/footer/layout.jsx
similarity index 100%
rename from app/_components/molecules/footer/layout.jsx
rename to src/components/molecules/footer/layout.jsx
diff --git a/app/_logic/auth/service.js b/src/logic/auth/service.js
similarity index 93%
rename from app/_logic/auth/service.js
rename to src/logic/auth/service.js
index a7dd861..74b0f75 100644
--- a/app/_logic/auth/service.js
+++ b/src/logic/auth/service.js
@@ -14,7 +14,7 @@
  */
 
 //* Imports
-import { CLIENT_ID, POD_PROVIDER_URI } from "../../_services/app/nodes";
+import { CLIENT_ID, POD_PROVIDER_URI } from "../../services/app/nodes";
 
 export async function getOptions() {
     // Logic
diff --git a/app/_logic/data/hook.js b/src/logic/data/hook.js
similarity index 100%
rename from app/_logic/data/hook.js
rename to src/logic/data/hook.js
diff --git a/app/_logic/data/service.js b/src/logic/data/service.js
similarity index 86%
rename from app/_logic/data/service.js
rename to src/logic/data/service.js
index 2be1a68..273b74a 100644
--- a/app/_logic/data/service.js
+++ b/src/logic/data/service.js
@@ -16,9 +16,9 @@
 //* Imports
 
 //* Local Imports
-import { APP_WEBID, APP_WEBID_DOC } from "../../_services/app/nodes";
-import { getProperties, getThing } from "../../_services/solid/service";
-import { appShape } from "../../_services/app/shape";
+import { APP_WEBID, APP_WEBID_DOC } from "../../services/app/nodes";
+import { getProperties, getThing } from "../../services/solid/service";
+import { appShape } from "../../services/app/shape";
 
 
 //* Main
diff --git a/app/_logic/metadata/service.js b/src/logic/metadata/service.js
similarity index 100%
rename from app/_logic/metadata/service.js
rename to src/logic/metadata/service.js
diff --git a/app/_logic/state/manager.jsx b/src/logic/state/manager.jsx
similarity index 100%
rename from app/_logic/state/manager.jsx
rename to src/logic/state/manager.jsx
diff --git a/app/_services/app/namespaces.js b/src/services/app/namespaces.js
similarity index 100%
rename from app/_services/app/namespaces.js
rename to src/services/app/namespaces.js
diff --git a/app/_services/app/nodes.js b/src/services/app/nodes.js
similarity index 100%
rename from app/_services/app/nodes.js
rename to src/services/app/nodes.js
diff --git a/app/_services/app/shape.js b/src/services/app/shape.js
similarity index 100%
rename from app/_services/app/shape.js
rename to src/services/app/shape.js
diff --git a/app/_services/solid/namespaces.js b/src/services/solid/namespaces.js
similarity index 100%
rename from app/_services/solid/namespaces.js
rename to src/services/solid/namespaces.js
diff --git a/app/_services/solid/service.js b/src/services/solid/service.js
similarity index 100%
rename from app/_services/solid/service.js
rename to src/services/solid/service.js