diff --git a/src/app/globals.css b/src/app/(pages)/globals.css
similarity index 100%
rename from src/app/globals.css
rename to src/app/(pages)/globals.css
diff --git a/src/app/layout.tsx b/src/app/(pages)/layout.tsx
similarity index 88%
rename from src/app/layout.tsx
rename to src/app/(pages)/layout.tsx
index 35c7bea..50fb6ac 100644
--- a/src/app/layout.tsx
+++ b/src/app/(pages)/layout.tsx
@@ -1,13 +1,13 @@
 import { Fonts } from "@/common/fonts";
-import Container from "@/components/container";
-import ThemeProvider from "@/components/theme-provider";
 import { Metadata, Viewport } from "next";
 import { ToastContainer } from "react-toastify";
 
 import "react-toastify/dist/ReactToastify.css";
 import "./globals.css";
 
-import Config from "../../config.json";
+import Config from "../../../config.json";
+import Container from "../components/container";
+import ThemeProvider from "../components/theme-provider";
 
 export const viewport: Viewport = {
   themeColor: "#3498DB",
diff --git a/src/app/page.tsx b/src/app/(pages)/page.tsx
similarity index 95%
rename from src/app/page.tsx
rename to src/app/(pages)/page.tsx
index 93d72c5..30370ee 100644
--- a/src/app/page.tsx
+++ b/src/app/(pages)/page.tsx
@@ -6,7 +6,7 @@ type Button = {
 };
 
 const buttons: Button[] = [
-  { title: "Get Started", url: "/player" },
+  { title: "Get Started", url: "/player/Notch" },
   { title: "Documentation", url: "https://api.mcutils.xyz/swagger-ui.html" },
 ];
 
diff --git a/src/app/player/[id]/page.tsx b/src/app/(pages)/player/[id]/page.tsx
similarity index 93%
rename from src/app/player/[id]/page.tsx
rename to src/app/(pages)/player/[id]/page.tsx
index fb644ff..ee1b1ac 100644
--- a/src/app/player/[id]/page.tsx
+++ b/src/app/(pages)/player/[id]/page.tsx
@@ -1,7 +1,7 @@
+import { NotFound } from "@/app/components/not-found";
+import { LookupPlayer } from "@/app/components/player/lookup-player";
+import { Card } from "@/app/components/ui/card";
 import { generateEmbed } from "@/common/embed";
-import { LookupPlayer } from "@/components/lookup-player";
-import { NotFound } from "@/components/not-found";
-import { Card } from "@/components/ui/card";
 import { getPlayer } from "mcutils-library";
 import { Player } from "mcutils-library/dist/types/player/player";
 import { Metadata } from "next";
diff --git a/src/app/server/[platform]/[hostname]/page.tsx b/src/app/(pages)/server/[platform]/[hostname]/page.tsx
similarity index 94%
rename from src/app/server/[platform]/[hostname]/page.tsx
rename to src/app/(pages)/server/[platform]/[hostname]/page.tsx
index 6b47401..c5f8fa3 100644
--- a/src/app/server/[platform]/[hostname]/page.tsx
+++ b/src/app/(pages)/server/[platform]/[hostname]/page.tsx
@@ -1,8 +1,8 @@
+import { NotFound } from "@/app/components/not-found";
+import { LookupServer } from "@/app/components/server/lookup-server";
+import { Card } from "@/app/components/ui/card";
 import { generateEmbed } from "@/common/embed";
 import { capitalizeFirstLetter } from "@/common/string-utils";
-import { LookupServer } from "@/components/lookup-server";
-import { NotFound } from "@/components/not-found";
-import { Card } from "@/components/ui/card";
 import { getServer } from "mcutils-library";
 import JavaMinecraftServer from "mcutils-library/dist/types/server/javaServer";
 import { ServerPlatform } from "mcutils-library/dist/types/server/platform";
diff --git a/src/components/container.tsx b/src/app/components/container.tsx
similarity index 100%
rename from src/components/container.tsx
rename to src/app/components/container.tsx
diff --git a/src/components/logo.tsx b/src/app/components/logo.tsx
similarity index 100%
rename from src/components/logo.tsx
rename to src/app/components/logo.tsx
diff --git a/src/components/navbar.tsx b/src/app/components/navbar.tsx
similarity index 94%
rename from src/components/navbar.tsx
rename to src/app/components/navbar.tsx
index 2116912..13c49eb 100644
--- a/src/components/navbar.tsx
+++ b/src/app/components/navbar.tsx
@@ -16,7 +16,7 @@ export default function NavBar() {
     <div className="bg-secondary w-full rounded-lg flex items-center gap-3 mt-2 bg-opacity-85">
       <div className="flex items-center gap-2 pl-3 pr-3">
         <Logo />
-        <Link href="/">
+        <Link href="/" className="hidden md:block">
           <p>Minecraft Utilities</p>
         </Link>
       </div>
diff --git a/src/components/not-found.tsx b/src/app/components/not-found.tsx
similarity index 100%
rename from src/components/not-found.tsx
rename to src/app/components/not-found.tsx
diff --git a/src/components/lookup-player.tsx b/src/app/components/player/lookup-player.tsx
similarity index 91%
rename from src/components/lookup-player.tsx
rename to src/app/components/player/lookup-player.tsx
index 80cad90..bb46133 100644
--- a/src/components/lookup-player.tsx
+++ b/src/app/components/player/lookup-player.tsx
@@ -2,8 +2,8 @@
 
 import { useRouter } from "next/navigation";
 import { useState } from "react";
-import { Button } from "./ui/button";
-import { Input } from "./ui/input";
+import { Button } from "../ui/button";
+import { Input } from "../ui/input";
 
 export function LookupPlayer() {
   const router = useRouter();
diff --git a/src/components/lookup-server.tsx b/src/app/components/server/lookup-server.tsx
similarity index 93%
rename from src/components/lookup-server.tsx
rename to src/app/components/server/lookup-server.tsx
index a6da690..bb86016 100644
--- a/src/components/lookup-server.tsx
+++ b/src/app/components/server/lookup-server.tsx
@@ -3,8 +3,8 @@
 import { ServerPlatform } from "mcutils-library/dist/types/server/platform";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
-import { Button } from "./ui/button";
-import { Input } from "./ui/input";
+import { Button } from "../ui/button";
+import { Input } from "../ui/input";
 
 export function LookupServer() {
   const router = useRouter();
diff --git a/src/components/theme-provider.tsx b/src/app/components/theme-provider.tsx
similarity index 100%
rename from src/components/theme-provider.tsx
rename to src/app/components/theme-provider.tsx
diff --git a/src/components/ui/button.tsx b/src/app/components/ui/button.tsx
similarity index 100%
rename from src/components/ui/button.tsx
rename to src/app/components/ui/button.tsx
diff --git a/src/components/ui/card.tsx b/src/app/components/ui/card.tsx
similarity index 100%
rename from src/components/ui/card.tsx
rename to src/app/components/ui/card.tsx
diff --git a/src/components/ui/input.tsx b/src/app/components/ui/input.tsx
similarity index 100%
rename from src/components/ui/input.tsx
rename to src/app/components/ui/input.tsx
diff --git a/src/components/loading-card.tsx b/src/components/loading-card.tsx
deleted file mode 100644
index be98a09..0000000
--- a/src/components/loading-card.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Card } from "./ui/card";
-
-export function LoadingCard() {
-  return (
-    <Card>
-      <p>Loading...</p>
-    </Card>
-  );
-}