diff --git a/src/app/(app)/_components/header.tsx b/src/app/(app)/(workshops)/_components/header.tsx
similarity index 100%
rename from src/app/(app)/_components/header.tsx
rename to src/app/(app)/(workshops)/_components/header.tsx
diff --git a/src/app/(app)/_components/main-nav.tsx b/src/app/(app)/(workshops)/_components/main-nav.tsx
similarity index 100%
rename from src/app/(app)/_components/main-nav.tsx
rename to src/app/(app)/(workshops)/_components/main-nav.tsx
diff --git a/src/app/(app)/_components/mobile-nav.tsx b/src/app/(app)/(workshops)/_components/mobile-nav.tsx
similarity index 100%
rename from src/app/(app)/_components/mobile-nav.tsx
rename to src/app/(app)/(workshops)/_components/mobile-nav.tsx
diff --git a/src/app/(app)/_components/user-dropdown.tsx b/src/app/(app)/(workshops)/_components/user-dropdown.tsx
similarity index 100%
rename from src/app/(app)/_components/user-dropdown.tsx
rename to src/app/(app)/(workshops)/_components/user-dropdown.tsx
diff --git a/src/app/(app)/dashboard/loading.tsx b/src/app/(app)/(workshops)/dashboard/loading.tsx
similarity index 100%
rename from src/app/(app)/dashboard/loading.tsx
rename to src/app/(app)/(workshops)/dashboard/loading.tsx
diff --git a/src/app/(app)/dashboard/page.tsx b/src/app/(app)/(workshops)/dashboard/page.tsx
similarity index 100%
rename from src/app/(app)/dashboard/page.tsx
rename to src/app/(app)/(workshops)/dashboard/page.tsx
diff --git a/src/app/(app)/explore/loading.tsx b/src/app/(app)/(workshops)/explore/loading.tsx
similarity index 100%
rename from src/app/(app)/explore/loading.tsx
rename to src/app/(app)/(workshops)/explore/loading.tsx
diff --git a/src/app/(app)/explore/page.tsx b/src/app/(app)/(workshops)/explore/page.tsx
similarity index 100%
rename from src/app/(app)/explore/page.tsx
rename to src/app/(app)/(workshops)/explore/page.tsx
diff --git a/src/app/(app)/layout.tsx b/src/app/(app)/(workshops)/layout.tsx
similarity index 100%
rename from src/app/(app)/layout.tsx
rename to src/app/(app)/(workshops)/layout.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/_components/organizer-section-skeleton.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/_components/organizer-section-skeleton.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/_components/organizer-section-skeleton.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/_components/organizer-section-skeleton.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/_components/organizer-section.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/_components/organizer-section.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/_components/organizer-section.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/_components/organizer-section.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/_components/register-button.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/_components/register-button.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/_components/register-button.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/_components/register-button.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/_components/start-workshop-button.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/_components/start-workshop-button.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/_components/start-workshop-button.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/_components/start-workshop-button.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/_components/workshop-button.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/_components/workshop-button.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/_components/workshop-button.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/_components/workshop-button.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/_components/workshop-registrants.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/_components/workshop-registrants.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/_components/workshop-registrants.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/_components/workshop-registrants.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/_components/workshop-settings.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/_components/workshop-settings.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/_components/workshop-settings.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/_components/workshop-settings.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/loading.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/loading.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/loading.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/loading.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/not-found.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/not-found.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/not-found.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/not-found.tsx
diff --git a/src/app/(app)/workshop/[workshopId]/page.tsx b/src/app/(app)/(workshops)/workshop/[workshopId]/page.tsx
similarity index 100%
rename from src/app/(app)/workshop/[workshopId]/page.tsx
rename to src/app/(app)/(workshops)/workshop/[workshopId]/page.tsx
diff --git a/src/app/(app)/session/[workshopId]/_components/session-call.tsx b/src/app/(app)/session/[workshopId]/_components/session-call.tsx
index 2cbed89..524883e 100644
--- a/src/app/(app)/session/[workshopId]/_components/session-call.tsx
+++ b/src/app/(app)/session/[workshopId]/_components/session-call.tsx
@@ -92,29 +92,7 @@ export function SessionCall({
               router.push("/dashboard")
             }}
           />
-          {/* <div className="grid w-full space-x-10 lg:grid-cols-[1fr_20rem]">
-            <div className="flex flex-col items-center justify-center space-y-4">
-              <SpeakerLayout />
-              <CallControls
-                onLeave={async () => {
-                  if (isOrganizer) {
-                    await MarkWorkshopHasCompleted(workshopId).then(() =>
-                      call.endCall()
-                    )
-                  }
-
-                  router.push("/dashboard")
-                }}
-              />
-            </div>
-
-            <div className="max-lg:hidden">
-              <CallParticipantsList onClose={() => undefined} />
-            </div>
-          </div>
-          <div className="lg:hidden">
-            <CallParticipantsList onClose={() => undefined} />
-          </div> */}
+          <CallParticipantsList onClose={() => undefined} />
         </StreamCall>
       </StreamTheme>
     </StreamVideo>
diff --git a/src/app/(app)/session/[workshopId]/layout.tsx b/src/app/(app)/session/[workshopId]/layout.tsx
new file mode 100644
index 0000000..fd194b0
--- /dev/null
+++ b/src/app/(app)/session/[workshopId]/layout.tsx
@@ -0,0 +1,7 @@
+export default function SessionLayout({ children }: React.PropsWithChildren) {
+  return (
+    <div className="relative flex min-h-screen flex-col">
+      <main className="flex-1">{children}</main>
+    </div>
+  )
+}
diff --git a/src/app/(app)/session/[workshopId]/page.tsx b/src/app/(app)/session/[workshopId]/page.tsx
index adb5de4..dbe4111 100644
--- a/src/app/(app)/session/[workshopId]/page.tsx
+++ b/src/app/(app)/session/[workshopId]/page.tsx
@@ -4,7 +4,6 @@ import { redirects } from "@/config/constants"
 import { getWorkshopRegistrants } from "@/server/data/registration"
 import { getUserSession } from "@/server/data/user"
 import { getWorkshopSession } from "@/server/data/workshop"
-import { Shell } from "@/components/shell"
 
 import { SessionCall } from "./_components/session-call"
 
@@ -48,12 +47,10 @@ export default async function SessionPage({ params }: SessionPageProps) {
   }
 
   return (
-    <Shell className="max-w-6xl" variant="centered">
-      <SessionCall
-        workshopId={workshopId}
-        isOrganizer={isOrganizer}
-        user={user}
-      />
-    </Shell>
+    <SessionCall
+      workshopId={workshopId}
+      isOrganizer={isOrganizer}
+      user={user}
+    />
   )
 }