diff --git a/Management.Web/Pages/AssignmentForm/AssignmentFormPage.razor b/Management.Web/Pages/AssignmentForm/AssignmentFormPage.razor
index 883ad83..1f2fdc9 100644
--- a/Management.Web/Pages/AssignmentForm/AssignmentFormPage.razor
+++ b/Management.Web/Pages/AssignmentForm/AssignmentFormPage.razor
@@ -4,7 +4,7 @@
 @using CanvasModel.Courses
 @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
 @using LocalModels
-@using Management.Web.Shared.Module.Assignment
+@using Management.Web.Pages.Course.Module.Assignment
 @using Management.Web.Shared.Components
 
 @inject FileStorageManager fileStorageManager
diff --git a/Management.Web/Pages/Course/Course.razor b/Management.Web/Pages/Course/Course.razor
index 81d3d59..aa194e0 100644
--- a/Management.Web/Pages/Course/Course.razor
+++ b/Management.Web/Pages/Course/Course.razor
@@ -3,7 +3,7 @@
 @using CanvasModel.Courses
 @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
 @using LocalModels
-@using Management.Web.Shared.Module.Assignment
+@using Management.Web.Pages.Course.Module.Assignment
 @using Management.Web.Shared.Components
 
 @inject FileStorageManager fileStorageManager
diff --git a/Management.Web/Pages/Course/CourseCalendar/Day/AssignmentInDay.razor b/Management.Web/Pages/Course/CourseCalendar/Day/AssignmentInDay.razor
index 3cd5e5a..ca6285c 100644
--- a/Management.Web/Pages/Course/CourseCalendar/Day/AssignmentInDay.razor
+++ b/Management.Web/Pages/Course/CourseCalendar/Day/AssignmentInDay.razor
@@ -1,10 +1,11 @@
-@using Management.Web.Shared.Module.Assignment
+@using Management.Web.Course.Module.Assignment
 
 @inject DragContainer dragContainer
 @inject NavigationManager Navigation
 @inject AssignmentEditorContext assignmentContext
 
 @inject MyLogger<AssignmentInDay> logger
+
 @inherits DroppableAssignment
 
 @code {
@@ -31,7 +32,7 @@
     dragContainer.DropCallback = null;
   }
 
-  private void OnClick() 
+  private void OnClick()
   {
     if(planner.LocalCourse != null)
     {
diff --git a/Management.Web/Pages/Course/CourseDetails.razor b/Management.Web/Pages/Course/CourseDetails.razor
index 509cd21..209e6df 100644
--- a/Management.Web/Pages/Course/CourseDetails.razor
+++ b/Management.Web/Pages/Course/CourseDetails.razor
@@ -1,6 +1,6 @@
 
 @using CanvasModel.EnrollmentTerms
-@using Management.Web.Shared.Module
+@using Management.Web.Pages.Course.Module
 @using Management.Web.Pages.Course.CourseCalendar
 
 @inject CanvasService canvas
diff --git a/Management.Web/Shared/Module/Assignment/AssignmentListItem.razor b/Management.Web/Pages/Course/Module/Assignment/AssignmentListItem.razor
similarity index 98%
rename from Management.Web/Shared/Module/Assignment/AssignmentListItem.razor
rename to Management.Web/Pages/Course/Module/Assignment/AssignmentListItem.razor
index 44ef775..f5452ea 100644
--- a/Management.Web/Shared/Module/Assignment/AssignmentListItem.razor
+++ b/Management.Web/Pages/Course/Module/Assignment/AssignmentListItem.razor
@@ -1,5 +1,6 @@
 @using Management.Web.Shared.Components
-@using CanvasModel.Assignments;
+@using Management.Web.Course.Module.Assignment
+@using CanvasModel.Assignments
 
 @inject DragContainer dragContainer
 @inject NavigationManager Navigation
diff --git a/Management.Web/Shared/Module/Assignment/DroppableAssignment.razor.cs b/Management.Web/Pages/Course/Module/Assignment/DroppableAssignment.razor.cs
similarity index 97%
rename from Management.Web/Shared/Module/Assignment/DroppableAssignment.razor.cs
rename to Management.Web/Pages/Course/Module/Assignment/DroppableAssignment.razor.cs
index a40daf2..cc93651 100644
--- a/Management.Web/Shared/Module/Assignment/DroppableAssignment.razor.cs
+++ b/Management.Web/Pages/Course/Module/Assignment/DroppableAssignment.razor.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace Management.Web.Shared.Module.Assignment;
+namespace Management.Web.Course.Module.Assignment;
 public class DroppableAssignment : ComponentBase
 {
   [Inject]
@@ -85,4 +85,4 @@ public class DroppableAssignment : ComponentBase
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/Management.Web/Shared/Module/ModuleDetail.razor b/Management.Web/Pages/Course/Module/ModuleDetail.razor
similarity index 96%
rename from Management.Web/Shared/Module/ModuleDetail.razor
rename to Management.Web/Pages/Course/Module/ModuleDetail.razor
index a3d029b..61c05c5 100644
--- a/Management.Web/Shared/Module/ModuleDetail.razor
+++ b/Management.Web/Pages/Course/Module/ModuleDetail.razor
@@ -1,6 +1,6 @@
 @using Management.Web.Shared.Components
 @using Management.Web.Shared.Components.Quiz
-@using Management.Web.Shared.Module.Assignment
+@using Management.Web.Pages.Course.Module
 @using LocalModels
 @using BlazorMonaco
 @using BlazorMonaco.Editor
@@ -136,13 +136,13 @@
           {
             <Spinner />
           }
-          else 
+          else
           {
             if(!isSyncedWithCanvas)
             {
-              <button 
+              <button
                 class="btn btn-outline-primary"
-                @onclick="Publish" 
+                @onclick="Publish"
                 disabled="@publishing"
               >
                 Add to Canvas
@@ -170,4 +170,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/Management.Web/Shared/Module/Modules.razor b/Management.Web/Pages/Course/Module/Modules.razor
similarity index 87%
rename from Management.Web/Shared/Module/Modules.razor
rename to Management.Web/Pages/Course/Module/Modules.razor
index c6b39c9..8e41530 100644
--- a/Management.Web/Shared/Module/Modules.razor
+++ b/Management.Web/Pages/Course/Module/Modules.razor
@@ -1,11 +1,11 @@
-@using Management.Web.Shared.Module
+@using Management.Web.Pages.Course.Module
 @using System.Linq
 @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
 
 @inject CoursePlanner planner
 
 @code {
-  private bool showNewModule { get; set; } = false;  
+  private bool showNewModule { get; set; } = false;
   protected override void OnInitialized()
   {
     planner.StateHasChanged += reload;
diff --git a/Management.Web/Shared/Module/NewAssignment.razor b/Management.Web/Pages/Course/Module/NewAssignment.razor
similarity index 100%
rename from Management.Web/Shared/Module/NewAssignment.razor
rename to Management.Web/Pages/Course/Module/NewAssignment.razor
diff --git a/Management.Web/Shared/Module/NewModule.razor b/Management.Web/Pages/Course/Module/NewModule.razor
similarity index 100%
rename from Management.Web/Shared/Module/NewModule.razor
rename to Management.Web/Pages/Course/Module/NewModule.razor
diff --git a/Management.Web/Shared/Module/NewQuiz.razor b/Management.Web/Pages/Course/Module/NewQuiz.razor
similarity index 100%
rename from Management.Web/Shared/Module/NewQuiz.razor
rename to Management.Web/Pages/Course/Module/NewQuiz.razor
diff --git a/Management.Web/Shared/Module/QuizListItem.razor b/Management.Web/Pages/Course/Module/QuizListItem.razor
similarity index 100%
rename from Management.Web/Shared/Module/QuizListItem.razor
rename to Management.Web/Pages/Course/Module/QuizListItem.razor
diff --git a/Management.Web/Shared/Module/RenameModule.razor b/Management.Web/Pages/Course/Module/RenameModule.razor
similarity index 100%
rename from Management.Web/Shared/Module/RenameModule.razor
rename to Management.Web/Pages/Course/Module/RenameModule.razor
diff --git a/Management.Web/Pages/Index.razor b/Management.Web/Pages/Index.razor
index 08f949d..3a04903 100644
--- a/Management.Web/Pages/Index.razor
+++ b/Management.Web/Pages/Index.razor
@@ -3,7 +3,7 @@
 @using CanvasModel.Courses
 @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
 @using LocalModels
-@using Management.Web.Shared.Module.Assignment
+@using Management.Web.Pages.Course.Module.Assignment
 @using Management.Web.Shared.Components
 
 @inject CanvasService canvas
diff --git a/Management.Web/Pages/QuizForm/QuizFormPage.razor b/Management.Web/Pages/QuizForm/QuizFormPage.razor
index 51c55ae..6d48f7a 100644
--- a/Management.Web/Pages/QuizForm/QuizFormPage.razor
+++ b/Management.Web/Pages/QuizForm/QuizFormPage.razor
@@ -6,8 +6,7 @@
 @using CanvasModel.Courses
 @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
 @using LocalModels
-@using Management.Web.Shared.Module.Assignment
-@using Management.Web.Shared.Components
+@using Management.Web.Pages.Course.Module.Assignment
 
 @inject FileStorageManager fileStorageManager
 @inject CanvasService canvas