diff --git a/src/app/components/mii-list.tsx b/src/app/components/mii-list/index.tsx
similarity index 98%
rename from src/app/components/mii-list.tsx
rename to src/app/components/mii-list/index.tsx
index 42d2d26..346af1c 100644
--- a/src/app/components/mii-list.tsx
+++ b/src/app/components/mii-list/index.tsx
@@ -4,9 +4,9 @@ import { Prisma } from "@prisma/client";
 import { auth } from "@/lib/auth";
 import { prisma } from "@/lib/prisma";
 
-import Carousel from "./carousel";
-import LikeButton from "./like-button";
 import SortSelect from "./sort-select";
+import Carousel from "../carousel";
+import LikeButton from "../like-button";
 
 interface Props {
 	searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
diff --git a/src/app/components/sort-select.tsx b/src/app/components/mii-list/sort-select.tsx
similarity index 100%
rename from src/app/components/sort-select.tsx
rename to src/app/components/mii-list/sort-select.tsx
diff --git a/src/app/components/submit/image-list.tsx b/src/app/components/submit-form/image-list.tsx
similarity index 100%
rename from src/app/components/submit/image-list.tsx
rename to src/app/components/submit-form/image-list.tsx
diff --git a/src/app/components/submit-form.tsx b/src/app/components/submit-form/index.tsx
similarity index 97%
rename from src/app/components/submit-form.tsx
rename to src/app/components/submit-form/index.tsx
index e8d5be9..9a134e5 100644
--- a/src/app/components/submit-form.tsx
+++ b/src/app/components/submit-form/index.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { redirect } from "next/navigation";
+import Image from "next/image";
 
 import { useCallback, useEffect, useState } from "react";
 import { FileWithPath, useDropzone } from "react-dropzone";
@@ -13,11 +14,10 @@ import { convertQrCode } from "@/lib/qr-codes";
 import Mii from "@/lib/mii.js/mii";
 import TomodachiLifeMii from "@/lib/tomodachi-life-mii";
 
-import TagSelector from "./submit/tag-selector";
-import ImageList from "./submit/image-list";
-import QrUpload from "./submit/qr-upload";
-import QrScanner from "./submit/qr-scanner";
-import Image from "next/image";
+import TagSelector from "./tag-selector";
+import ImageList from "./image-list";
+import QrUpload from "./qr-upload";
+import QrScanner from "./qr-scanner";
 
 export default function SubmitForm() {
 	const [files, setFiles] = useState<FileWithPath[]>([]);
diff --git a/src/app/components/submit/qr-finder.tsx b/src/app/components/submit-form/qr-finder.tsx
similarity index 100%
rename from src/app/components/submit/qr-finder.tsx
rename to src/app/components/submit-form/qr-finder.tsx
diff --git a/src/app/components/submit/qr-scanner.tsx b/src/app/components/submit-form/qr-scanner.tsx
similarity index 100%
rename from src/app/components/submit/qr-scanner.tsx
rename to src/app/components/submit-form/qr-scanner.tsx
diff --git a/src/app/components/submit/qr-upload.tsx b/src/app/components/submit-form/qr-upload.tsx
similarity index 100%
rename from src/app/components/submit/qr-upload.tsx
rename to src/app/components/submit-form/qr-upload.tsx
diff --git a/src/app/components/submit/tag-selector.tsx b/src/app/components/submit-form/tag-selector.tsx
similarity index 100%
rename from src/app/components/submit/tag-selector.tsx
rename to src/app/components/submit-form/tag-selector.tsx