diff --git a/gridwalk-ui/src/app/workspace/[workspaceId]/workspaceProjects.tsx b/gridwalk-ui/src/app/workspace/[workspaceId]/workspaceProjects.tsx
index f02ad49..0645a38 100644
--- a/gridwalk-ui/src/app/workspace/[workspaceId]/workspaceProjects.tsx
+++ b/gridwalk-ui/src/app/workspace/[workspaceId]/workspaceProjects.tsx
@@ -12,7 +12,7 @@ import {
   DeleteIcon,
 } from "lucide-react";
 import { CreateProjectModal, DeleteProjectModal } from "./projectModal";
-import { HelpSupportModal } from "../supportModal";
+import { HelpSupportModal } from "../components/supportModal";
 import { AddWorkspaceMemberModal } from "./addMemberModal";
 import { ViewWorkspaceMemberModal } from "./viewMembersModal";
 import { DeleteWorkspaceModal } from "./deleteWorkspaceModal";
diff --git a/gridwalk-ui/src/app/workspace/actions.ts b/gridwalk-ui/src/app/workspace/actions/actions.ts
similarity index 100%
rename from gridwalk-ui/src/app/workspace/actions.ts
rename to gridwalk-ui/src/app/workspace/actions/actions.ts
diff --git a/gridwalk-ui/src/app/workspace/createWorkspaceModal.tsx b/gridwalk-ui/src/app/workspace/components/createWorkspaceModal.tsx
similarity index 100%
rename from gridwalk-ui/src/app/workspace/createWorkspaceModal.tsx
rename to gridwalk-ui/src/app/workspace/components/createWorkspaceModal.tsx
diff --git a/gridwalk-ui/src/app/workspace/profileModal.tsx b/gridwalk-ui/src/app/workspace/components/profileModal.tsx
similarity index 98%
rename from gridwalk-ui/src/app/workspace/profileModal.tsx
rename to gridwalk-ui/src/app/workspace/components/profileModal.tsx
index 130918d..bb23e69 100644
--- a/gridwalk-ui/src/app/workspace/profileModal.tsx
+++ b/gridwalk-ui/src/app/workspace/components/profileModal.tsx
@@ -6,7 +6,7 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
-import { ProfileData } from "./actions";
+import { ProfileData } from "./actions/actions";
 import { Button } from "@/components/ui/button";
 import { User, Mail, Settings } from "lucide-react";
 
diff --git a/gridwalk-ui/src/app/workspace/sidebar.tsx b/gridwalk-ui/src/app/workspace/components/sidebar.tsx
similarity index 98%
rename from gridwalk-ui/src/app/workspace/sidebar.tsx
rename to gridwalk-ui/src/app/workspace/components/sidebar.tsx
index 261d584..9b5a49f 100644
--- a/gridwalk-ui/src/app/workspace/sidebar.tsx
+++ b/gridwalk-ui/src/app/workspace/components/sidebar.tsx
@@ -9,7 +9,12 @@ import {
 } from "@/components/ui/sheet";
 import { Button } from "@/components/ui/button";
 import { Menu, LogOut, ChevronDown, Plus, Briefcase } from "lucide-react";
-import { ProfileData, Workspaces, logout, createWorkspace } from "./actions";
+import {
+  ProfileData,
+  Workspaces,
+  logout,
+  createWorkspace,
+} from "../actions/actions";
 import { CreateWorkspaceSidebar } from "./createWorkspaceModal";
 import { useRouter } from "next/navigation";
 import { useState, useEffect } from "react";
diff --git a/gridwalk-ui/src/app/workspace/supportModal.tsx b/gridwalk-ui/src/app/workspace/components/supportModal.tsx
similarity index 100%
rename from gridwalk-ui/src/app/workspace/supportModal.tsx
rename to gridwalk-ui/src/app/workspace/components/supportModal.tsx
diff --git a/gridwalk-ui/src/app/workspace/layout.tsx b/gridwalk-ui/src/app/workspace/layout.tsx
index cc1d135..9fb84a4 100644
--- a/gridwalk-ui/src/app/workspace/layout.tsx
+++ b/gridwalk-ui/src/app/workspace/layout.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import { getProfile, getWorkspaces } from "./actions";
-import { Sidebar } from "./sidebar";
+import { getProfile, getWorkspaces } from "./actions/actions";
+import { Sidebar } from "./components/sidebar";
 import { WorkspaceProvider } from "./workspaceContext";
 
 export const dynamic = "force-dynamic";
@@ -13,8 +13,9 @@ export default async function WorkspaceLayout({
   const profileData = await getProfile();
   const workspaceData = await getWorkspaces();
 
-  const initials =
-    `${profileData.first_name?.[0] || ""}${profileData.last_name?.[0] || ""}`.toUpperCase();
+  const initials = `${profileData.first_name?.[0] || ""}${
+    profileData.last_name?.[0] || ""
+  }`.toUpperCase();
 
   return (
     <WorkspaceProvider workspaces={workspaceData}>
diff --git a/gridwalk-ui/src/app/workspace/page.tsx b/gridwalk-ui/src/app/workspace/page.tsx
index d7b1b76..221b4ad 100644
--- a/gridwalk-ui/src/app/workspace/page.tsx
+++ b/gridwalk-ui/src/app/workspace/page.tsx
@@ -11,11 +11,11 @@ import {
   Clock,
 } from "lucide-react";
 import { Button } from "@/components/ui/button";
-import { CreateWorkspaceModal } from "./createWorkspaceModal";
-import { createWorkspace } from "./actions";
+import { CreateWorkspaceModal } from "./components/createWorkspaceModal";
+import { createWorkspace } from "./actions/actions";
 import { getProjects } from "@/app/workspace/[workspaceId]/actions/projects/get";
 import { getWorkspaceMembers } from "@/app/workspace/[workspaceId]/actions/workspace/get_members";
-import { HelpSupportModal } from "./supportModal";
+import { HelpSupportModal } from "./components/supportModal";
 import { useWorkspaces } from "./workspaceContext";
 
 // Stat cards for the user