diff --git a/app/admin/articles/editor/[articleId]/page.tsx b/app/admin/articles/editor/[articleId]/page.tsx
index 963efcf..65d7764 100644
--- a/app/admin/articles/editor/[articleId]/page.tsx
+++ b/app/admin/articles/editor/[articleId]/page.tsx
@@ -13,8 +13,8 @@ import { IContentTableEntry } from "../../../../../types/contentTable";
 import { CreateArticle, UpdateArticle } from "../../../../../types/api";
 import { formatTextToUrlName } from "../../../../../utils";
 import { isValidText } from "../../../../../validators";
-import { apiUrl } from "../../../../global";
-import Markdown from "../../../../Markdown";
+import { apiUrl } from "../../../../../global";
+import Markdown from "../../../../../components/Markdown";
 
 type ArticleWithCategory = Prisma.ArticleGetPayload<{ include: { category: true } }>;
 
diff --git a/app/admin/categories/editor/[categoryId]/page.tsx b/app/admin/categories/editor/[categoryId]/page.tsx
index 0233c64..b7f680c 100644
--- a/app/admin/categories/editor/[categoryId]/page.tsx
+++ b/app/admin/categories/editor/[categoryId]/page.tsx
@@ -10,7 +10,7 @@ import { CreateCategory, UpdateCategory } from "../../../../../types/api";
 import urlJoin from "url-join";
 import { useRouter } from "next/navigation";
 import { useEffect } from "react";
-import { apiUrl } from "../../../../global";
+import { apiUrl } from "../../../../../global";
 
 type CategoryWithSvg = Prisma.CategoryGetPayload<{ include: { svg: true } }>;
 
diff --git a/app/admin/images/page.tsx b/app/admin/images/page.tsx
index 5dcad0f..b133866 100644
--- a/app/admin/images/page.tsx
+++ b/app/admin/images/page.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Image } from "@prisma/client";
 import { Image as GalleryImage } from "react-grid-gallery";
 import urlJoin from "url-join";
-import { apiUrl } from "../../global";
+import { apiUrl } from "../../../global";
 import Gallery from "./Gallery";
 
 async function getImages(): Promise<GalleryImage[]> {
diff --git a/app/articles/[categoryName]/[articleName]/page.tsx b/app/articles/[categoryName]/[articleName]/page.tsx
index 3eafada..061d841 100644
--- a/app/articles/[categoryName]/[articleName]/page.tsx
+++ b/app/articles/[categoryName]/[articleName]/page.tsx
@@ -4,9 +4,9 @@ import Sidebar from "./Sidebar";
 import styles from "../../../../styles/modules/Article.module.scss";
 import Image from "next/image";
 import urlJoin from "url-join";
-import { apiUrl } from "../../../global";
+import { apiUrl } from "../../../../global";
 import { Prisma } from "@prisma/client";
-import Markdown from "../../../Markdown";
+import Markdown from "../../../../components/Markdown";
 import { IContentTableEntry } from "../../../../types/contentTable";
 
 type ArticleWithIncludes = Prisma.ArticleGetPayload<{
diff --git a/app/articles/[categoryName]/page.tsx b/app/articles/[categoryName]/page.tsx
index a0b8d41..f1d6b2f 100644
--- a/app/articles/[categoryName]/page.tsx
+++ b/app/articles/[categoryName]/page.tsx
@@ -1,6 +1,6 @@
 import styles from "../../../styles/modules/Category.module.scss";
 import Link from "next/link";
-import { apiUrl } from "../../global";
+import { apiUrl } from "../../../global";
 import { Article, Category } from "@prisma/client";
 import urlJoin from "url-join";
 
diff --git a/app/articles/page.tsx b/app/articles/page.tsx
index 9aaf721..38a1671 100644
--- a/app/articles/page.tsx
+++ b/app/articles/page.tsx
@@ -2,7 +2,7 @@ import styles from "../../styles/modules/CategoryList.module.scss";
 import Link from "next/link";
 import { Category, Svg, Prisma } from "@prisma/client";
 import urlJoin from "url-join";
-import { apiUrl } from "../global";
+import { apiUrl } from "../../global";
 
 type CategoryWithSvg = Prisma.CategoryGetPayload<{ include: { svg: true } }>;
 
diff --git a/app/layout.tsx b/app/layout.tsx
index 78dba7c..d5baa7e 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,12 +1,12 @@
 import "../styles/globals.scss";
 import "../styles/variables_colors.scss";
 import "../styles/variables.scss";
-import Nav from "./Nav";
-import Footer from "./Footer";
 import { Category } from "@prisma/client";
 import urlJoin from "url-join";
-import { apiUrl } from "./global";
+import { apiUrl } from "../global";
 import Link from "next/link";
+import Footer from "../components/Footer";
+import Nav from "../components/Nav";
 
 async function getCategories(): Promise<Category[]> {
   const result: Response = await fetch(urlJoin(apiUrl, `categories`), {
diff --git a/app/Footer.tsx b/components/Footer.tsx
similarity index 100%
rename from app/Footer.tsx
rename to components/Footer.tsx
diff --git a/app/Markdown.tsx b/components/Markdown.tsx
similarity index 98%
rename from app/Markdown.tsx
rename to components/Markdown.tsx
index cfb6967..21bd1f5 100644
--- a/app/Markdown.tsx
+++ b/components/Markdown.tsx
@@ -11,7 +11,7 @@ import remarkStringify from "remark-stringify";
 import { useState, useEffect } from "react";
 import { useLocalStorage } from "usehooks-ts";
 import React from "react";
-import Head from "./head";
+import Head from "../app/head";
 import { formatTextToUrlName } from "../utils";
 
 function flatten(text, child) {
diff --git a/app/Nav.tsx b/components/Nav.tsx
similarity index 100%
rename from app/Nav.tsx
rename to components/Nav.tsx
diff --git a/app/global.ts b/global.ts
similarity index 100%
rename from app/global.ts
rename to global.ts