diff --git a/nextjs/src/app/CourseDetailsWrapper.tsx b/nextjs/src/app/CourseDetailsWrapper.tsx
deleted file mode 100644
index 4680818..0000000
--- a/nextjs/src/app/CourseDetailsWrapper.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-"use client";
-import { useLocalCourseDetailsQuery } from "@/hooks/localCoursesHooks";
-import { CourseContext } from "./course/[courseName]/courseContext";
-import CourseDetails from "./course/[courseName]/CourseDetails";
-
-export default function CourseDetailsWrapper({
-  courseName,
-}: {
-  courseName: string;
-}) {
-  const { data: course } = useLocalCourseDetailsQuery(courseName);
-  console.log("courseName", courseName);
-  return (
-    <CourseContext.Provider value={{ localCourse: course }}>
-      <CourseDetails />
-    </CourseContext.Provider>
-  );
-}
diff --git a/nextjs/src/app/course/[courseName]/CourseDetails.tsx b/nextjs/src/app/course/[courseName]/CourseDetails.tsx
index 4234ca5..0856aea 100644
--- a/nextjs/src/app/course/[courseName]/CourseDetails.tsx
+++ b/nextjs/src/app/course/[courseName]/CourseDetails.tsx
@@ -1,8 +1,8 @@
 "use client";
 import { getDateFromStringOrThrow } from "@/models/local/timeUtils";
-import { useCourseContext } from "./courseContext";
-import { getMonthsBetweenDates } from "./calendarMonthUtils";
-import CalendarMonth from "./CalendarMonth";
+import { useCourseContext } from "./context/courseContext";
+import { getMonthsBetweenDates } from "./calendar/calendarMonthUtils";
+import CalendarMonth from "./calendar/CalendarMonth";
 
 export default function CourseDetails() {
   const context = useCourseContext();
diff --git a/nextjs/src/app/course/[courseName]/CalendarMonth.tsx b/nextjs/src/app/course/[courseName]/calendar/CalendarMonth.tsx
similarity index 100%
rename from nextjs/src/app/course/[courseName]/CalendarMonth.tsx
rename to nextjs/src/app/course/[courseName]/calendar/CalendarMonth.tsx
diff --git a/nextjs/src/app/course/[courseName]/Day.tsx b/nextjs/src/app/course/[courseName]/calendar/Day.tsx
similarity index 100%
rename from nextjs/src/app/course/[courseName]/Day.tsx
rename to nextjs/src/app/course/[courseName]/calendar/Day.tsx
diff --git a/nextjs/src/app/course/[courseName]/calendarMonthUtils.ts b/nextjs/src/app/course/[courseName]/calendar/calendarMonthUtils.ts
similarity index 100%
rename from nextjs/src/app/course/[courseName]/calendarMonthUtils.ts
rename to nextjs/src/app/course/[courseName]/calendar/calendarMonthUtils.ts
diff --git a/nextjs/src/app/course/[courseName]/CourseContextProvider.tsx b/nextjs/src/app/course/[courseName]/context/CourseContextProvider.tsx
similarity index 100%
rename from nextjs/src/app/course/[courseName]/CourseContextProvider.tsx
rename to nextjs/src/app/course/[courseName]/context/CourseContextProvider.tsx
diff --git a/nextjs/src/app/course/[courseName]/courseContext.ts b/nextjs/src/app/course/[courseName]/context/courseContext.ts
similarity index 100%
rename from nextjs/src/app/course/[courseName]/courseContext.ts
rename to nextjs/src/app/course/[courseName]/context/courseContext.ts
diff --git a/nextjs/src/app/course/[courseName]/page.tsx b/nextjs/src/app/course/[courseName]/page.tsx
index 6ef89bc..1a4bbe0 100644
--- a/nextjs/src/app/course/[courseName]/page.tsx
+++ b/nextjs/src/app/course/[courseName]/page.tsx
@@ -1,6 +1,7 @@
-import CourseDetailsWrapper from "@/app/CourseDetailsWrapper";
 import { getDehydratedClient } from "@/app/layout";
 import { HydrationBoundary } from "@tanstack/react-query";
+import CourseContextProvider from "./context/CourseContextProvider";
+import CourseDetails from "./CourseDetails";
 
 export default async function CoursePage({
   params: { courseName },
@@ -10,7 +11,9 @@ export default async function CoursePage({
   const dehydratedState = await getDehydratedClient();
   return (
     <HydrationBoundary state={dehydratedState}>
-      <CourseDetailsWrapper courseName={courseName} />
+      <CourseContextProvider localCourseName={courseName}>
+        <CourseDetails />
+      </CourseContextProvider>
     </HydrationBoundary>
   );
 }