diff --git a/frontend/app/projects/[projectId]/folders/FolderDialog.tsx b/frontend/app/projects/[projectId]/folders/FolderDialog.tsx
index 9a8e0f7..2d97ec6 100644
--- a/frontend/app/projects/[projectId]/folders/FolderDialog.tsx
+++ b/frontend/app/projects/[projectId]/folders/FolderDialog.tsx
@@ -11,7 +11,7 @@ import {
   ModalBody,
   ModalFooter,
 } from "@nextui-org/react";
-import { FolderType } from "./layout";
+import { FolderType } from "@/types/folder";
 
 type Props = {
   isOpen: boolean;
diff --git a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/case-attachments-editor.tsx b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/CaseAttachmentsEditor.tsx
similarity index 97%
rename from frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/case-attachments-editor.tsx
rename to frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/CaseAttachmentsEditor.tsx
index db881a2..ae0b53d 100644
--- a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/case-attachments-editor.tsx
+++ b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/CaseAttachmentsEditor.tsx
@@ -1,5 +1,5 @@
 import { Image, Button, Tooltip, Card, CardBody } from "@nextui-org/react";
-import { AttachmentType } from "./caseTypes";
+import { AttachmentType } from "../../../../../../../types/case";
 import { Trash, ArrowDownToLine } from "lucide-react";
 
 type Props = {
diff --git a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/case-editor.tsx b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/CaseEditor.tsx
similarity index 98%
rename from frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/case-editor.tsx
rename to frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/CaseEditor.tsx
index f4a46c9..d2dc9fc 100644
--- a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/case-editor.tsx
+++ b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/CaseEditor.tsx
@@ -13,9 +13,9 @@ import {
 import { useRouter } from "next/navigation";
 import { Save, Plus, ArrowLeft, ArrowUpFromLine } from "lucide-react";
 import { priorities, testTypes, templates } from "@/config/selection";
-import CaseStepsEditor from "./case-steps-editor";
-import CaseAttachmentsEditor from "./case-attachments-editor";
-import { CaseType, AttachmentType } from "./caseTypes";
+import CaseStepsEditor from "./CaseStepsEditor";
+import CaseAttachmentsEditor from "./CaseAttachmentsEditor";
+import { CaseType, AttachmentType } from "@/types/case";
 import {
   fetchCase,
   fetchCreateStep,
diff --git a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/case-steps-editor.tsx b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/CaseStepsEditor.tsx
similarity index 97%
rename from frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/case-steps-editor.tsx
rename to frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/CaseStepsEditor.tsx
index 3c1d55a..a403620 100644
--- a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/case-steps-editor.tsx
+++ b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/CaseStepsEditor.tsx
@@ -1,5 +1,5 @@
 import { Textarea, Button, Tooltip } from "@nextui-org/react";
-import { StepType } from "./caseTypes";
+import { StepType } from "../../../../../../../types/case";
 import { Plus, Trash } from "lucide-react";
 
 type Props = {
diff --git a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/page.tsx b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/page.tsx
index b2a2383..eadbb71 100644
--- a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/page.tsx
+++ b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/page.tsx
@@ -1,4 +1,4 @@
-import CaseEditor from "./case-editor";
+import CaseEditor from "./CaseEditor";
 
 export default function Page({
   params,
diff --git a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/caseTypes.ts b/frontend/types/case.ts
similarity index 100%
rename from frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/caseTypes.ts
rename to frontend/types/case.ts