diff --git a/Management.Test/CanvasModels/TermTests.cs b/Management.Test/CanvasModels/TermTests.cs
new file mode 100644
index 0000000..5befac5
--- /dev/null
+++ b/Management.Test/CanvasModels/TermTests.cs
@@ -0,0 +1,29 @@
+
+using CanvasModel.EnrollmentTerms;
+
+public class DeserializationTests
+{
+  [Test]
+  public void TestTerm()
+  {
+
+    var canvasContentResponse = @"{
+      ""enrollment_terms"": [
+        {
+          ""id"": 1,
+          ""name"": ""one"",
+          ""start_at"": ""2022-01-01T00:00:00Z"",
+          ""end_at"": ""2022-02-01T00:00:00Z"",
+          ""created_at"": ""2011-04-26T23:34:35Z"",
+          ""workflow_state"": ""active"",
+          ""grading_period_group_id"": null
+        }
+      ]
+    }";
+
+    var result = JsonSerializer.Deserialize<RedundantEnrollmentTermsResponse>(canvasContentResponse);
+
+    result.Should().NotBeNull();
+    result?.EnrollmentTerms?.First().Id.Should().Be(1);
+  }
+}
\ No newline at end of file
diff --git a/Management.Test/Models/TermTests.cs b/Management.Test/Models/TermTests.cs
deleted file mode 100644
index af1206d..0000000
--- a/Management.Test/Models/TermTests.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-
-using CanvasModel.EnrollmentTerms;
-
-public class DeserializationTests
-{
-  // [Test]
-  // public void TestTerm()
-  // {
-
-  //   var canvasContentResponse = @"{
-  //     ""enrollment_terms"": [
-  //       {
-  //         ""id"": 1,
-  //         ""name"": ""one"",
-  //         ""start_at"": 2022-01-01T00:00:00Z,
-  //         ""end_at"": 2022-02-01T00:00:00Z,
-  //         ""created_at"": ""2011-04-26T23:34:35Z"",
-  //         ""workflow_state"": ""active"",
-  //         ""grading_period_group_id"": null
-  //       },
-  //   }";
-
-  //   var result = JsonSerializer.Deserialize<EnrollmentTermModel>(canvasContentResponse);
-
-  //   result.Should().NotBeNull();
-  //   result?.Id.Should().Be(1);
-  // }
-}
\ No newline at end of file
diff --git a/Management.Test/UnitTest1.cs b/Management.Test/UnitTest1.cs
deleted file mode 100644
index 4572dc4..0000000
--- a/Management.Test/UnitTest1.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Management.Test;
-
-public class Tests
-{
-    [SetUp]
-    public void Setup()
-    {
-    }
-
-    [Test]
-    public void Test1()
-    {
-        Assert.Pass();
-    }
-}
\ No newline at end of file
diff --git a/Management/GlobalUsings.cs b/Management/GlobalUsings.cs
index 6634942..136b6fe 100644
--- a/Management/GlobalUsings.cs
+++ b/Management/GlobalUsings.cs
@@ -1,3 +1,2 @@
-
 global using System.Text.Json.Serialization;
-global using System.Text.Json;
\ No newline at end of file
+global using System.Text.Json;
diff --git a/Management/Models/CanvasModel/Assignments/AssignmentDateModel.cs b/Management/Models/CanvasModels/Assignments/AssignmentDateModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Assignments/AssignmentDateModel.cs
rename to Management/Models/CanvasModels/Assignments/AssignmentDateModel.cs
diff --git a/Management/Models/CanvasModel/Assignments/AssignmentModel.cs b/Management/Models/CanvasModels/Assignments/AssignmentModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Assignments/AssignmentModel.cs
rename to Management/Models/CanvasModels/Assignments/AssignmentModel.cs
diff --git a/Management/Models/CanvasModel/Assignments/AssignmentOverrideModel.cs b/Management/Models/CanvasModels/Assignments/AssignmentOverrideModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Assignments/AssignmentOverrideModel.cs
rename to Management/Models/CanvasModels/Assignments/AssignmentOverrideModel.cs
diff --git a/Management/Models/CanvasModel/Assignments/ExternalToolTagAttributesModel.cs b/Management/Models/CanvasModels/Assignments/ExternalToolTagAttributesModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Assignments/ExternalToolTagAttributesModel.cs
rename to Management/Models/CanvasModels/Assignments/ExternalToolTagAttributesModel.cs
diff --git a/Management/Models/CanvasModel/Assignments/LockInfoModel.cs b/Management/Models/CanvasModels/Assignments/LockInfoModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Assignments/LockInfoModel.cs
rename to Management/Models/CanvasModels/Assignments/LockInfoModel.cs
diff --git a/Management/Models/CanvasModel/Assignments/NeedsGradingCountModel.cs b/Management/Models/CanvasModels/Assignments/NeedsGradingCountModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Assignments/NeedsGradingCountModel.cs
rename to Management/Models/CanvasModels/Assignments/NeedsGradingCountModel.cs
diff --git a/Management/Models/CanvasModel/Assignments/RubricCriteriaModel.cs b/Management/Models/CanvasModels/Assignments/RubricCriteriaModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Assignments/RubricCriteriaModel.cs
rename to Management/Models/CanvasModels/Assignments/RubricCriteriaModel.cs
diff --git a/Management/Models/CanvasModel/Assignments/RubricRatingModel.cs b/Management/Models/CanvasModels/Assignments/RubricRatingModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Assignments/RubricRatingModel.cs
rename to Management/Models/CanvasModels/Assignments/RubricRatingModel.cs
diff --git a/Management/Models/CanvasModel/Assignments/TurnitinSettingsModel.cs b/Management/Models/CanvasModels/Assignments/TurnitinSettingsModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Assignments/TurnitinSettingsModel.cs
rename to Management/Models/CanvasModels/Assignments/TurnitinSettingsModel.cs
diff --git a/Management/Models/CanvasModel/Courses/CalendarLinkModel.cs b/Management/Models/CanvasModels/Courses/CalendarLinkModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Courses/CalendarLinkModel.cs
rename to Management/Models/CanvasModels/Courses/CalendarLinkModel.cs
diff --git a/Management/Models/CanvasModel/Courses/CourseModel.cs b/Management/Models/CanvasModels/Courses/CourseModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Courses/CourseModel.cs
rename to Management/Models/CanvasModels/Courses/CourseModel.cs
diff --git a/Management/Models/CanvasModel/Courses/CourseProgressModel.cs b/Management/Models/CanvasModels/Courses/CourseProgressModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Courses/CourseProgressModel.cs
rename to Management/Models/CanvasModels/Courses/CourseProgressModel.cs
diff --git a/Management/Models/CanvasModel/Courses/CourseSettingsModel.cs b/Management/Models/CanvasModels/Courses/CourseSettingsModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Courses/CourseSettingsModel.cs
rename to Management/Models/CanvasModels/Courses/CourseSettingsModel.cs
diff --git a/Management/Models/CanvasModel/Courses/ShortCourseModel.cs b/Management/Models/CanvasModels/Courses/ShortCourseModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Courses/ShortCourseModel.cs
rename to Management/Models/CanvasModels/Courses/ShortCourseModel.cs
diff --git a/Management/Models/CanvasModel/Courses/TermModel.cs b/Management/Models/CanvasModels/Courses/TermModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Courses/TermModel.cs
rename to Management/Models/CanvasModels/Courses/TermModel.cs
diff --git a/Management/Models/CanvasModel/Discussions/DiscussionTopicModel.cs b/Management/Models/CanvasModels/Discussions/DiscussionTopicModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Discussions/DiscussionTopicModel.cs
rename to Management/Models/CanvasModels/Discussions/DiscussionTopicModel.cs
diff --git a/Management/Models/CanvasModel/Discussions/FileAttachmentModel.cs b/Management/Models/CanvasModels/Discussions/FileAttachmentModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Discussions/FileAttachmentModel.cs
rename to Management/Models/CanvasModels/Discussions/FileAttachmentModel.cs
diff --git a/Management/Models/CanvasModel/Discussions/TopicEntryModel.cs b/Management/Models/CanvasModels/Discussions/TopicEntryModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Discussions/TopicEntryModel.cs
rename to Management/Models/CanvasModels/Discussions/TopicEntryModel.cs
diff --git a/Management/Models/CanvasModel/Discussions/TopicReplyModel.cs b/Management/Models/CanvasModels/Discussions/TopicReplyModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Discussions/TopicReplyModel.cs
rename to Management/Models/CanvasModels/Discussions/TopicReplyModel.cs
diff --git a/Management/Models/CanvasModel/EnrollmentTerms/EnrollmentTermModel.cs b/Management/Models/CanvasModels/EnrollmentTerms/EnrollmentTermModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/EnrollmentTerms/EnrollmentTermModel.cs
rename to Management/Models/CanvasModels/EnrollmentTerms/EnrollmentTermModel.cs
diff --git a/Management/Models/CanvasModel/EnrollmentTerms/RedundantEnrollmentTermsResponse.cs b/Management/Models/CanvasModels/EnrollmentTerms/RedundantEnrollmentTermsResponse.cs
similarity index 100%
rename from Management/Models/CanvasModel/EnrollmentTerms/RedundantEnrollmentTermsResponse.cs
rename to Management/Models/CanvasModels/EnrollmentTerms/RedundantEnrollmentTermsResponse.cs
diff --git a/Management/Models/CanvasModel/Enrollments/EnrollmentModel.cs b/Management/Models/CanvasModels/Enrollments/EnrollmentModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Enrollments/EnrollmentModel.cs
rename to Management/Models/CanvasModels/Enrollments/EnrollmentModel.cs
diff --git a/Management/Models/CanvasModel/Enrollments/GradeModel.cs b/Management/Models/CanvasModels/Enrollments/GradeModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Enrollments/GradeModel.cs
rename to Management/Models/CanvasModels/Enrollments/GradeModel.cs
diff --git a/Management/Models/CanvasModel/Submissions/MediaCommentModel.cs b/Management/Models/CanvasModels/Submissions/MediaCommentModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Submissions/MediaCommentModel.cs
rename to Management/Models/CanvasModels/Submissions/MediaCommentModel.cs
diff --git a/Management/Models/CanvasModel/Submissions/SubmissionCommentModel.cs b/Management/Models/CanvasModels/Submissions/SubmissionCommentModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Submissions/SubmissionCommentModel.cs
rename to Management/Models/CanvasModels/Submissions/SubmissionCommentModel.cs
diff --git a/Management/Models/CanvasModel/Submissions/SubmissionModel.cs b/Management/Models/CanvasModels/Submissions/SubmissionModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Submissions/SubmissionModel.cs
rename to Management/Models/CanvasModels/Submissions/SubmissionModel.cs
diff --git a/Management/Models/CanvasModel/Users/ActivityStreamObjectModel.cs b/Management/Models/CanvasModels/Users/ActivityStreamObjectModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/ActivityStreamObjectModel.cs
rename to Management/Models/CanvasModels/Users/ActivityStreamObjectModel.cs
diff --git a/Management/Models/CanvasModel/Users/ActivityStreamSummaryEntryModel.cs b/Management/Models/CanvasModels/Users/ActivityStreamSummaryEntryModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/ActivityStreamSummaryEntryModel.cs
rename to Management/Models/CanvasModels/Users/ActivityStreamSummaryEntryModel.cs
diff --git a/Management/Models/CanvasModel/Users/AnonymousUserDisplayModel.cs b/Management/Models/CanvasModels/Users/AnonymousUserDisplayModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/AnonymousUserDisplayModel.cs
rename to Management/Models/CanvasModels/Users/AnonymousUserDisplayModel.cs
diff --git a/Management/Models/CanvasModel/Users/AvatarModel.cs b/Management/Models/CanvasModels/Users/AvatarModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/AvatarModel.cs
rename to Management/Models/CanvasModels/Users/AvatarModel.cs
diff --git a/Management/Models/CanvasModel/Users/CourseNicknameModel.cs b/Management/Models/CanvasModels/Users/CourseNicknameModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/CourseNicknameModel.cs
rename to Management/Models/CanvasModels/Users/CourseNicknameModel.cs
diff --git a/Management/Models/CanvasModel/Users/PageViewLinksModel.cs b/Management/Models/CanvasModels/Users/PageViewLinksModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/PageViewLinksModel.cs
rename to Management/Models/CanvasModels/Users/PageViewLinksModel.cs
diff --git a/Management/Models/CanvasModel/Users/PageViewModel.cs b/Management/Models/CanvasModels/Users/PageViewModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/PageViewModel.cs
rename to Management/Models/CanvasModels/Users/PageViewModel.cs
diff --git a/Management/Models/CanvasModel/Users/ProfileModel.cs b/Management/Models/CanvasModels/Users/ProfileModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/ProfileModel.cs
rename to Management/Models/CanvasModels/Users/ProfileModel.cs
diff --git a/Management/Models/CanvasModel/Users/ShortUserModel.cs b/Management/Models/CanvasModels/Users/ShortUserModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/ShortUserModel.cs
rename to Management/Models/CanvasModels/Users/ShortUserModel.cs
diff --git a/Management/Models/CanvasModel/Users/UserDisplayModel.cs b/Management/Models/CanvasModels/Users/UserDisplayModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/UserDisplayModel.cs
rename to Management/Models/CanvasModels/Users/UserDisplayModel.cs
diff --git a/Management/Models/CanvasModel/Users/UserModel.cs b/Management/Models/CanvasModels/Users/UserModel.cs
similarity index 100%
rename from Management/Models/CanvasModel/Users/UserModel.cs
rename to Management/Models/CanvasModels/Users/UserModel.cs
diff --git a/Management/Services/CanvasService.cs b/Management/Services/CanvasService.cs
index 5c1c25d..8a835c7 100644
--- a/Management/Services/CanvasService.cs
+++ b/Management/Services/CanvasService.cs
@@ -64,7 +64,4 @@ public class CanvasService
       .TrimStart('<')
       .Replace(" ", "")
       .Replace(BaseUrl, "");
-
-
-
 }
\ No newline at end of file