diff --git a/Frontend/src/app/components/raw-json-badge.tsx b/Frontend/src/app/components/badge/raw-json.tsx
similarity index 100%
rename from Frontend/src/app/components/raw-json-badge.tsx
rename to Frontend/src/app/components/badge/raw-json.tsx
diff --git a/Frontend/src/app/components/copy-button.tsx b/Frontend/src/app/components/button/copy-button.tsx
similarity index 100%
rename from Frontend/src/app/components/copy-button.tsx
rename to Frontend/src/app/components/button/copy-button.tsx
diff --git a/Frontend/src/app/components/github-star-button.tsx b/Frontend/src/app/components/button/github-star-button.tsx
similarity index 96%
rename from Frontend/src/app/components/github-star-button.tsx
rename to Frontend/src/app/components/button/github-star-button.tsx
index 05a2415..762aa75 100644
--- a/Frontend/src/app/components/github-star-button.tsx
+++ b/Frontend/src/app/components/button/github-star-button.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import MinecraftButton from "@/components/minecraft-button";
+import MinecraftButton from "@/components/button/minecraft-button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { StarIcon } from "@heroicons/react/24/outline";
 import Link from "next/link";
diff --git a/Frontend/src/app/components/minecraft-button.tsx b/Frontend/src/app/components/button/minecraft-button.tsx
similarity index 97%
rename from Frontend/src/app/components/minecraft-button.tsx
rename to Frontend/src/app/components/button/minecraft-button.tsx
index a0841db..a1e43c7 100644
--- a/Frontend/src/app/components/minecraft-button.tsx
+++ b/Frontend/src/app/components/button/minecraft-button.tsx
@@ -1,5 +1,5 @@
 import { Button } from "@/components/ui/button";
-import { cn } from "@/app/common/utils";
+import { cn } from "@/lib";
 import { ButtonHTMLAttributes, ReactElement, ReactNode } from "react";
 
 /**
diff --git a/Frontend/src/app/components/landing/hero.tsx b/Frontend/src/app/components/landing/hero.tsx
index 1521b4d..6881dae 100644
--- a/Frontend/src/app/components/landing/hero.tsx
+++ b/Frontend/src/app/components/landing/hero.tsx
@@ -1,5 +1,5 @@
-import GitHubStarButton from "@/components/github-star-button";
-import MinecraftButton from "@/components/minecraft-button";
+import GitHubStarButton from "@/components/button/github-star-button";
+import MinecraftButton from "@/components/button/minecraft-button";
 import config from "@/config";
 import { minecrafter } from "@/font/fonts";
 import { cn } from "@/app/common/utils";
diff --git a/Frontend/src/app/components/navbar.tsx b/Frontend/src/app/components/navbar.tsx
index d4ed06c..6bf3136 100644
--- a/Frontend/src/app/components/navbar.tsx
+++ b/Frontend/src/app/components/navbar.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import GitHubStarButton from "@/components/github-star-button";
+import GitHubStarButton from "@/components/button/github-star-button";
 import config from "@/config";
 import { minecrafter } from "@/font/fonts";
 import { cn } from "@/app/common/utils";
diff --git a/Frontend/src/app/components/player/player-result.tsx b/Frontend/src/app/components/player/player-result.tsx
index ce4a8ce..aff48d8 100644
--- a/Frontend/src/app/components/player/player-result.tsx
+++ b/Frontend/src/app/components/player/player-result.tsx
@@ -1,4 +1,4 @@
-import CopyButton from "@/components/copy-button";
+import CopyButton from "@/components/button/copy-button";
 import {
     ContextMenu,
     ContextMenuContent,
@@ -11,7 +11,7 @@ import Link from "next/link";
 import { ReactElement } from "react";
 import { CachedPlayer, SkinPart } from "restfulmc-lib";
 import CodeDialog from "@/components/code/code-dialog";
-import RawJsonBadge from "@/components/raw-json-badge";
+import RawJson from "@/components/badge/raw-json";
 
 /**
  * The props for a player result.
@@ -45,7 +45,7 @@ const PlayerResult = ({ query, player }: PlayerResultProps): ReactElement => (
                         title="Raw Player Data"
                         description={`The raw JSON data for the player ${player.username}:`}
                         language="json"
-                        trigger={<RawJsonBadge />}
+                        trigger={<RawJson />}
                     >
                         {JSON.stringify(player, undefined, 4)}
                     </CodeDialog>
diff --git a/Frontend/src/app/components/player/player-search.tsx b/Frontend/src/app/components/player/player-search.tsx
index 10cc8a0..bd2f792 100644
--- a/Frontend/src/app/components/player/player-search.tsx
+++ b/Frontend/src/app/components/player/player-search.tsx
@@ -1,4 +1,4 @@
-import MinecraftButton from "@/components/minecraft-button";
+import MinecraftButton from "@/components/button/minecraft-button";
 import { Input } from "@/components/ui/input";
 
 import { Label } from "@/components/ui/label";
diff --git a/Frontend/src/app/components/server/server-result.tsx b/Frontend/src/app/components/server/server-result.tsx
index 327a7c6..2b43177 100644
--- a/Frontend/src/app/components/server/server-result.tsx
+++ b/Frontend/src/app/components/server/server-result.tsx
@@ -8,7 +8,7 @@ import {
 import config from "@/config";
 import { minecraft } from "@/font/fonts";
 import CodeDialog from "@/components/code/code-dialog";
-import RawJsonBadge from "@/components/raw-json-badge";
+import RawJson from "@/components/badge/raw-json";
 
 /**
  * The props for a server result.
@@ -95,7 +95,7 @@ const ServerResult = ({ server }: ServerResultProps): ReactElement => {
                 title="Raw Server Data"
                 description={`The raw JSON data for the player ${server.hostname}:`}
                 language="json"
-                trigger={<RawJsonBadge />}
+                trigger={<RawJson />}
             >
                 {JSON.stringify(server, undefined, 4)}
             </CodeDialog>
diff --git a/Frontend/src/app/components/server/server-search.tsx b/Frontend/src/app/components/server/server-search.tsx
index 0c34007..bb1888b 100644
--- a/Frontend/src/app/components/server/server-search.tsx
+++ b/Frontend/src/app/components/server/server-search.tsx
@@ -1,4 +1,4 @@
-import MinecraftButton from "@/components/minecraft-button";
+import MinecraftButton from "@/components/button/minecraft-button";
 import { Input } from "@/components/ui/input";
 
 import { Label } from "@/components/ui/label";
diff --git a/Frontend/src/app/error.tsx b/Frontend/src/app/error.tsx
index daf3080..041f34a 100644
--- a/Frontend/src/app/error.tsx
+++ b/Frontend/src/app/error.tsx
@@ -4,7 +4,7 @@ import Creeper from "@/components/creeper";
 import { minecrafter } from "@/font/fonts";
 import { cn } from "@/app/common/utils";
 import { ReactElement, useEffect } from "react";
-import MinecraftButton from "@/components/minecraft-button";
+import MinecraftButton from "@/components/button/minecraft-button";
 
 /**
  * The error page.