diff --git a/app/Http/Controllers/Admin/Manage/AssignmentController.php b/app/Http/Controllers/Admin/Manage/Academic/AssignmentController.php
similarity index 87%
rename from app/Http/Controllers/Admin/Manage/AssignmentController.php
rename to app/Http/Controllers/Admin/Manage/Academic/AssignmentController.php
index 1bf5846..cec712d 100644
--- a/app/Http/Controllers/Admin/Manage/AssignmentController.php
+++ b/app/Http/Controllers/Admin/Manage/Academic/AssignmentController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Academic;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\AssignmentRequest;
+use App\Http\Requests\Admin\Manage\Academic\AssignmentRequest;
 use App\Http\Requests\PaginatedRequest;
 use App\Models\Assignment;
-use App\Services\Admin\Manage\AssignmentService;
-use App\Services\Admin\Manage\CourseClassService;
+use App\Services\Admin\Manage\Academic\AssignmentService;
+use App\Services\Admin\Manage\Course\CourseClassService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Inertia\Response;
diff --git a/app/Http/Controllers/Admin/Manage/AttendanceController.php b/app/Http/Controllers/Admin/Manage/Academic/AttendanceController.php
similarity index 88%
rename from app/Http/Controllers/Admin/Manage/AttendanceController.php
rename to app/Http/Controllers/Admin/Manage/Academic/AttendanceController.php
index 712105f..08f1e96 100644
--- a/app/Http/Controllers/Admin/Manage/AttendanceController.php
+++ b/app/Http/Controllers/Admin/Manage/Academic/AttendanceController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Academic;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\AttendanceStoreRequest;
+use App\Http\Requests\Admin\Manage\Academic\AttendanceStoreRequest;
 use App\Models\CourseClass;
-use App\Services\Admin\Manage\AttendanceService;
-use App\Services\Admin\Manage\CourseClassService;
+use App\Services\Admin\Manage\Academic\AttendanceService;
+use App\Services\Admin\Manage\Course\CourseClassService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Inertia\Response;
diff --git a/app/Http/Controllers/Admin/Manage/CourseRegistrationController.php b/app/Http/Controllers/Admin/Manage/Academic/CourseRegistrationController.php
similarity index 90%
rename from app/Http/Controllers/Admin/Manage/CourseRegistrationController.php
rename to app/Http/Controllers/Admin/Manage/Academic/CourseRegistrationController.php
index 4806ecd..d31a7f2 100644
--- a/app/Http/Controllers/Admin/Manage/CourseRegistrationController.php
+++ b/app/Http/Controllers/Admin/Manage/Academic/CourseRegistrationController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Academic;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\CourseRegistrationRequest;
+use App\Http\Requests\Admin\Manage\Academic\CourseRegistrationRequest;
 use App\Http\Requests\PaginatedRequest;
 use App\Models\CourseRegistration;
-use App\Services\Admin\Manage\CourseClassService;
-use App\Services\Admin\Manage\CourseRegistrationService;
+use App\Services\Admin\Manage\Academic\CourseRegistrationService;
+use App\Services\Admin\Manage\Course\CourseClassService;
 use App\Services\Admin\Master\AcademicTermService;
 use App\Services\Admin\Users\LecturerService;
 use App\Services\Admin\Users\StudentService;
diff --git a/app/Http/Controllers/Admin/Manage/MaterialController.php b/app/Http/Controllers/Admin/Manage/Academic/MaterialController.php
similarity index 87%
rename from app/Http/Controllers/Admin/Manage/MaterialController.php
rename to app/Http/Controllers/Admin/Manage/Academic/MaterialController.php
index f12a842..82f561e 100644
--- a/app/Http/Controllers/Admin/Manage/MaterialController.php
+++ b/app/Http/Controllers/Admin/Manage/Academic/MaterialController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Academic;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\MaterialRequest;
+use App\Http\Requests\Admin\Manage\Academic\MaterialRequest;
 use App\Http\Requests\PaginatedRequest;
 use App\Models\Material;
-use App\Services\Admin\Manage\CourseClassService;
-use App\Services\Admin\Manage\MaterialService;
+use App\Services\Admin\Manage\Academic\MaterialService;
+use App\Services\Admin\Manage\Course\CourseClassService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Inertia\Response;
diff --git a/app/Http/Controllers/Admin/Manage/ScheduleController.php b/app/Http/Controllers/Admin/Manage/Academic/ScheduleController.php
similarity index 86%
rename from app/Http/Controllers/Admin/Manage/ScheduleController.php
rename to app/Http/Controllers/Admin/Manage/Academic/ScheduleController.php
index 4d6a724..8ea4dfb 100644
--- a/app/Http/Controllers/Admin/Manage/ScheduleController.php
+++ b/app/Http/Controllers/Admin/Manage/Academic/ScheduleController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Academic;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\ScheduleRequest;
+use App\Http\Requests\Admin\Manage\Academic\ScheduleRequest;
 use App\Models\Schedule;
-use App\Services\Admin\Manage\CourseClassService;
-use App\Services\Admin\Manage\ScheduleService;
+use App\Services\Admin\Manage\Academic\ScheduleService;
+use App\Services\Admin\Manage\Course\CourseClassService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Inertia\Response;
diff --git a/app/Http/Controllers/Admin/Manage/SubmissionController.php b/app/Http/Controllers/Admin/Manage/Academic/SubmissionController.php
similarity index 90%
rename from app/Http/Controllers/Admin/Manage/SubmissionController.php
rename to app/Http/Controllers/Admin/Manage/Academic/SubmissionController.php
index 7753042..68b34c5 100644
--- a/app/Http/Controllers/Admin/Manage/SubmissionController.php
+++ b/app/Http/Controllers/Admin/Manage/Academic/SubmissionController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Academic;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\SubmissionRequest;
+use App\Http\Requests\Admin\Manage\Academic\SubmissionRequest;
 use App\Models\Assignment;
 use App\Models\Submission;
-use App\Services\Admin\Manage\SubmissionService;
+use App\Services\Admin\Manage\Academic\SubmissionService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Inertia\Response;
diff --git a/app/Http/Controllers/Admin/Manage/AnnouncementController.php b/app/Http/Controllers/Admin/Manage/Announcement/AnnouncementController.php
similarity index 89%
rename from app/Http/Controllers/Admin/Manage/AnnouncementController.php
rename to app/Http/Controllers/Admin/Manage/Announcement/AnnouncementController.php
index 46373ce..6305d5e 100644
--- a/app/Http/Controllers/Admin/Manage/AnnouncementController.php
+++ b/app/Http/Controllers/Admin/Manage/Announcement/AnnouncementController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Announcement;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\AnnouncementRequest;
+use App\Http\Requests\Admin\Manage\Announcement\AnnouncementRequest;
 use App\Http\Requests\PaginatedRequest;
 use App\Models\Announcement;
-use App\Services\Admin\Manage\AnnouncementService;
+use App\Services\Admin\Manage\Announcement\AnnouncementService;
 use App\Services\Admin\Master\DepartmentService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
diff --git a/app/Http/Controllers/Admin/Manage/ClassEnrollmentController.php b/app/Http/Controllers/Admin/Manage/Course/ClassEnrollmentController.php
similarity index 88%
rename from app/Http/Controllers/Admin/Manage/ClassEnrollmentController.php
rename to app/Http/Controllers/Admin/Manage/Course/ClassEnrollmentController.php
index c473665..291ddd2 100644
--- a/app/Http/Controllers/Admin/Manage/ClassEnrollmentController.php
+++ b/app/Http/Controllers/Admin/Manage/Course/ClassEnrollmentController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Course;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\ClassEnrollmentRequest;
+use App\Http\Requests\Admin\Manage\Course\ClassEnrollmentRequest;
 use App\Models\ClassEnrollment;
 use App\Models\CourseClass;
-use App\Services\Admin\Manage\ClassEnrollmentService;
+use App\Services\Admin\Manage\Course\ClassEnrollmentService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Inertia\Response;
diff --git a/app/Http/Controllers/Admin/Manage/CourseClassController.php b/app/Http/Controllers/Admin/Manage/Course/CourseClassController.php
similarity index 89%
rename from app/Http/Controllers/Admin/Manage/CourseClassController.php
rename to app/Http/Controllers/Admin/Manage/Course/CourseClassController.php
index 3304ee1..d5cba7d 100644
--- a/app/Http/Controllers/Admin/Manage/CourseClassController.php
+++ b/app/Http/Controllers/Admin/Manage/Course/CourseClassController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Course;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\CourseClassRequest;
+use App\Http\Requests\Admin\Manage\Course\CourseClassRequest;
 use App\Http\Requests\PaginatedRequest;
 use App\Models\CourseClass;
-use App\Services\Admin\Manage\CourseClassService;
-use App\Services\Admin\Manage\CourseService;
+use App\Services\Admin\Manage\Course\CourseClassService;
+use App\Services\Admin\Manage\Course\CourseService;
 use App\Services\Admin\Master\AcademicTermService;
 use App\Services\Admin\Users\LecturerService;
 use Illuminate\Http\RedirectResponse;
diff --git a/app/Http/Controllers/Admin/Manage/CourseController.php b/app/Http/Controllers/Admin/Manage/Course/CourseController.php
similarity index 90%
rename from app/Http/Controllers/Admin/Manage/CourseController.php
rename to app/Http/Controllers/Admin/Manage/Course/CourseController.php
index 69c3fc6..4a03f5b 100644
--- a/app/Http/Controllers/Admin/Manage/CourseController.php
+++ b/app/Http/Controllers/Admin/Manage/Course/CourseController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Course;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\CourseRequest;
+use App\Http\Requests\Admin\Manage\Course\CourseRequest;
 use App\Http\Requests\PaginatedRequest;
 use App\Models\Course;
-use App\Services\Admin\Manage\CourseService;
+use App\Services\Admin\Manage\Course\CourseService;
 use App\Services\Admin\Master\DepartmentService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
diff --git a/app/Http/Controllers/Admin/Manage/TuitionInvoiceController.php b/app/Http/Controllers/Admin/Manage/Finance/TuitionInvoiceController.php
similarity index 91%
rename from app/Http/Controllers/Admin/Manage/TuitionInvoiceController.php
rename to app/Http/Controllers/Admin/Manage/Finance/TuitionInvoiceController.php
index 776238c..149bde5 100644
--- a/app/Http/Controllers/Admin/Manage/TuitionInvoiceController.php
+++ b/app/Http/Controllers/Admin/Manage/Finance/TuitionInvoiceController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Finance;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\TuitionInvoiceRequest;
+use App\Http\Requests\Admin\Manage\Finance\TuitionInvoiceRequest;
 use App\Http\Requests\PaginatedRequest;
 use App\Models\TuitionInvoice;
-use App\Services\Admin\Manage\TuitionInvoiceService;
+use App\Services\Admin\Manage\Finance\TuitionInvoiceService;
 use App\Services\Admin\Master\AcademicTermService;
 use App\Services\Admin\Users\StudentService;
 use Illuminate\Http\RedirectResponse;
diff --git a/app/Http/Controllers/Admin/Manage/TuitionPaymentController.php b/app/Http/Controllers/Admin/Manage/Finance/TuitionPaymentController.php
similarity index 90%
rename from app/Http/Controllers/Admin/Manage/TuitionPaymentController.php
rename to app/Http/Controllers/Admin/Manage/Finance/TuitionPaymentController.php
index f2ab4c5..7ee49e6 100644
--- a/app/Http/Controllers/Admin/Manage/TuitionPaymentController.php
+++ b/app/Http/Controllers/Admin/Manage/Finance/TuitionPaymentController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Finance;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\TuitionPaymentRequest;
+use App\Http\Requests\Admin\Manage\Finance\TuitionPaymentRequest;
 use App\Models\TuitionInvoice;
 use App\Models\TuitionPayment;
-use App\Services\Admin\Manage\TuitionPaymentService;
+use App\Services\Admin\Manage\Finance\TuitionPaymentService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
 use Inertia\Response;
diff --git a/app/Http/Controllers/Admin/Manage/AcademicAdvisingLogController.php b/app/Http/Controllers/Admin/Manage/Service/AcademicAdvisingLogController.php
similarity index 91%
rename from app/Http/Controllers/Admin/Manage/AcademicAdvisingLogController.php
rename to app/Http/Controllers/Admin/Manage/Service/AcademicAdvisingLogController.php
index 134de40..8229aed 100644
--- a/app/Http/Controllers/Admin/Manage/AcademicAdvisingLogController.php
+++ b/app/Http/Controllers/Admin/Manage/Service/AcademicAdvisingLogController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Service;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\AcademicAdvisingLogRequest;
+use App\Http\Requests\Admin\Manage\Service\AcademicAdvisingLogRequest;
 use App\Http\Requests\PaginatedRequest;
 use App\Models\AcademicAdvisingLog;
-use App\Services\Admin\Manage\AcademicAdvisingLogService;
+use App\Services\Admin\Manage\Service\AcademicAdvisingLogService;
 use App\Services\Admin\Users\LecturerService;
 use App\Services\Admin\Users\StudentService;
 use Illuminate\Http\RedirectResponse;
diff --git a/app/Http/Controllers/Admin/Manage/LetterRequestController.php b/app/Http/Controllers/Admin/Manage/Service/LetterRequestController.php
similarity index 90%
rename from app/Http/Controllers/Admin/Manage/LetterRequestController.php
rename to app/Http/Controllers/Admin/Manage/Service/LetterRequestController.php
index 65a37f0..b21f6e0 100644
--- a/app/Http/Controllers/Admin/Manage/LetterRequestController.php
+++ b/app/Http/Controllers/Admin/Manage/Service/LetterRequestController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Manage;
+namespace App\Http\Controllers\Admin\Manage\Service;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\Manage\LetterRequestRequest;
+use App\Http\Requests\Admin\Manage\Service\LetterRequestRequest;
 use App\Http\Requests\PaginatedRequest;
 use App\Models\LetterRequest;
-use App\Services\Admin\Manage\LetterRequestService;
+use App\Services\Admin\Manage\Service\LetterRequestService;
 use App\Services\Admin\Users\StudentService;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Inertia;
diff --git a/app/Http/Requests/Admin/Manage/AssignmentRequest.php b/app/Http/Requests/Admin/Manage/Academic/AssignmentRequest.php
similarity index 92%
rename from app/Http/Requests/Admin/Manage/AssignmentRequest.php
rename to app/Http/Requests/Admin/Manage/Academic/AssignmentRequest.php
index 30a8f38..7cd40e5 100644
--- a/app/Http/Requests/Admin/Manage/AssignmentRequest.php
+++ b/app/Http/Requests/Admin/Manage/Academic/AssignmentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Academic;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/Admin/Manage/AttendanceStoreRequest.php b/app/Http/Requests/Admin/Manage/Academic/AttendanceStoreRequest.php
similarity index 92%
rename from app/Http/Requests/Admin/Manage/AttendanceStoreRequest.php
rename to app/Http/Requests/Admin/Manage/Academic/AttendanceStoreRequest.php
index c2832b1..780e39e 100644
--- a/app/Http/Requests/Admin/Manage/AttendanceStoreRequest.php
+++ b/app/Http/Requests/Admin/Manage/Academic/AttendanceStoreRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Academic;
 
 use App\Enums\AttendanceStatus;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Requests/Admin/Manage/CourseRegistrationRequest.php b/app/Http/Requests/Admin/Manage/Academic/CourseRegistrationRequest.php
similarity index 96%
rename from app/Http/Requests/Admin/Manage/CourseRegistrationRequest.php
rename to app/Http/Requests/Admin/Manage/Academic/CourseRegistrationRequest.php
index 668d106..fbd3c86 100644
--- a/app/Http/Requests/Admin/Manage/CourseRegistrationRequest.php
+++ b/app/Http/Requests/Admin/Manage/Academic/CourseRegistrationRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Academic;
 
 use App\Enums\RegistrationStatus;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Requests/Admin/Manage/MaterialRequest.php b/app/Http/Requests/Admin/Manage/Academic/MaterialRequest.php
similarity index 93%
rename from app/Http/Requests/Admin/Manage/MaterialRequest.php
rename to app/Http/Requests/Admin/Manage/Academic/MaterialRequest.php
index 453760a..80ab783 100644
--- a/app/Http/Requests/Admin/Manage/MaterialRequest.php
+++ b/app/Http/Requests/Admin/Manage/Academic/MaterialRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Academic;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/Admin/Manage/ScheduleRequest.php b/app/Http/Requests/Admin/Manage/Academic/ScheduleRequest.php
similarity index 93%
rename from app/Http/Requests/Admin/Manage/ScheduleRequest.php
rename to app/Http/Requests/Admin/Manage/Academic/ScheduleRequest.php
index 769f6c7..54ddfd2 100644
--- a/app/Http/Requests/Admin/Manage/ScheduleRequest.php
+++ b/app/Http/Requests/Admin/Manage/Academic/ScheduleRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Academic;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/Admin/Manage/SubmissionRequest.php b/app/Http/Requests/Admin/Manage/Academic/SubmissionRequest.php
similarity index 96%
rename from app/Http/Requests/Admin/Manage/SubmissionRequest.php
rename to app/Http/Requests/Admin/Manage/Academic/SubmissionRequest.php
index 6a4499f..c37da27 100644
--- a/app/Http/Requests/Admin/Manage/SubmissionRequest.php
+++ b/app/Http/Requests/Admin/Manage/Academic/SubmissionRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Academic;
 
 use App\Enums\SubmissionStatus;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Requests/Admin/Manage/AnnouncementRequest.php b/app/Http/Requests/Admin/Manage/Announcement/AnnouncementRequest.php
similarity index 90%
rename from app/Http/Requests/Admin/Manage/AnnouncementRequest.php
rename to app/Http/Requests/Admin/Manage/Announcement/AnnouncementRequest.php
index cc12a46..2a087cc 100644
--- a/app/Http/Requests/Admin/Manage/AnnouncementRequest.php
+++ b/app/Http/Requests/Admin/Manage/Announcement/AnnouncementRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Announcement;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/Admin/Manage/ClassEnrollmentRequest.php b/app/Http/Requests/Admin/Manage/Course/ClassEnrollmentRequest.php
similarity index 93%
rename from app/Http/Requests/Admin/Manage/ClassEnrollmentRequest.php
rename to app/Http/Requests/Admin/Manage/Course/ClassEnrollmentRequest.php
index a224331..89fc2ce 100644
--- a/app/Http/Requests/Admin/Manage/ClassEnrollmentRequest.php
+++ b/app/Http/Requests/Admin/Manage/Course/ClassEnrollmentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Course;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/Admin/Manage/CourseClassRequest.php b/app/Http/Requests/Admin/Manage/Course/CourseClassRequest.php
similarity index 94%
rename from app/Http/Requests/Admin/Manage/CourseClassRequest.php
rename to app/Http/Requests/Admin/Manage/Course/CourseClassRequest.php
index 531e930..0f7b051 100644
--- a/app/Http/Requests/Admin/Manage/CourseClassRequest.php
+++ b/app/Http/Requests/Admin/Manage/Course/CourseClassRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Course;
 
 use App\Enums\ClassMethod;
 use App\Models\Course;
diff --git a/app/Http/Requests/Admin/Manage/CourseRequest.php b/app/Http/Requests/Admin/Manage/Course/CourseRequest.php
similarity index 93%
rename from app/Http/Requests/Admin/Manage/CourseRequest.php
rename to app/Http/Requests/Admin/Manage/Course/CourseRequest.php
index 40bbe84..282bdc4 100644
--- a/app/Http/Requests/Admin/Manage/CourseRequest.php
+++ b/app/Http/Requests/Admin/Manage/Course/CourseRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Course;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/Admin/Manage/TuitionInvoiceRequest.php b/app/Http/Requests/Admin/Manage/Finance/TuitionInvoiceRequest.php
similarity index 92%
rename from app/Http/Requests/Admin/Manage/TuitionInvoiceRequest.php
rename to app/Http/Requests/Admin/Manage/Finance/TuitionInvoiceRequest.php
index ea2a44c..655bc66 100644
--- a/app/Http/Requests/Admin/Manage/TuitionInvoiceRequest.php
+++ b/app/Http/Requests/Admin/Manage/Finance/TuitionInvoiceRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Finance;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/Admin/Manage/TuitionPaymentRequest.php b/app/Http/Requests/Admin/Manage/Finance/TuitionPaymentRequest.php
similarity index 93%
rename from app/Http/Requests/Admin/Manage/TuitionPaymentRequest.php
rename to app/Http/Requests/Admin/Manage/Finance/TuitionPaymentRequest.php
index a818687..f814d91 100644
--- a/app/Http/Requests/Admin/Manage/TuitionPaymentRequest.php
+++ b/app/Http/Requests/Admin/Manage/Finance/TuitionPaymentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Finance;
 
 use App\Enums\PaymentStatus;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Requests/Admin/Manage/AcademicAdvisingLogRequest.php b/app/Http/Requests/Admin/Manage/Service/AcademicAdvisingLogRequest.php
similarity index 92%
rename from app/Http/Requests/Admin/Manage/AcademicAdvisingLogRequest.php
rename to app/Http/Requests/Admin/Manage/Service/AcademicAdvisingLogRequest.php
index d8ef181..3fd918a 100644
--- a/app/Http/Requests/Admin/Manage/AcademicAdvisingLogRequest.php
+++ b/app/Http/Requests/Admin/Manage/Service/AcademicAdvisingLogRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Service;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/Admin/Manage/LetterRequestRequest.php b/app/Http/Requests/Admin/Manage/Service/LetterRequestRequest.php
similarity index 93%
rename from app/Http/Requests/Admin/Manage/LetterRequestRequest.php
rename to app/Http/Requests/Admin/Manage/Service/LetterRequestRequest.php
index 7879d19..d4d721c 100644
--- a/app/Http/Requests/Admin/Manage/LetterRequestRequest.php
+++ b/app/Http/Requests/Admin/Manage/Service/LetterRequestRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Admin\Manage;
+namespace App\Http\Requests\Admin\Manage\Service;
 
 use App\Enums\LetterStatus;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Services/Admin/Manage/AssignmentService.php b/app/Services/Admin/Manage/Academic/AssignmentService.php
similarity index 97%
rename from app/Services/Admin/Manage/AssignmentService.php
rename to app/Services/Admin/Manage/Academic/AssignmentService.php
index d43808a..3e167c0 100644
--- a/app/Services/Admin/Manage/AssignmentService.php
+++ b/app/Services/Admin/Manage/Academic/AssignmentService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Academic;
 
 use App\Models\Assignment;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
diff --git a/app/Services/Admin/Manage/AttendanceService.php b/app/Services/Admin/Manage/Academic/AttendanceService.php
similarity index 98%
rename from app/Services/Admin/Manage/AttendanceService.php
rename to app/Services/Admin/Manage/Academic/AttendanceService.php
index cbf7fda..5a2b292 100644
--- a/app/Services/Admin/Manage/AttendanceService.php
+++ b/app/Services/Admin/Manage/Academic/AttendanceService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Academic;
 
 use App\Enums\AttendanceStatus;
 use App\Models\Attendance;
diff --git a/app/Services/Admin/Manage/CourseRegistrationService.php b/app/Services/Admin/Manage/Academic/CourseRegistrationService.php
similarity index 98%
rename from app/Services/Admin/Manage/CourseRegistrationService.php
rename to app/Services/Admin/Manage/Academic/CourseRegistrationService.php
index 7484d3f..4a283d6 100644
--- a/app/Services/Admin/Manage/CourseRegistrationService.php
+++ b/app/Services/Admin/Manage/Academic/CourseRegistrationService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Academic;
 
 use App\Enums\RegistrationStatus;
 use App\Models\ClassEnrollment;
diff --git a/app/Services/Admin/Manage/MaterialService.php b/app/Services/Admin/Manage/Academic/MaterialService.php
similarity index 97%
rename from app/Services/Admin/Manage/MaterialService.php
rename to app/Services/Admin/Manage/Academic/MaterialService.php
index b6af2b9..864ce14 100644
--- a/app/Services/Admin/Manage/MaterialService.php
+++ b/app/Services/Admin/Manage/Academic/MaterialService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Academic;
 
 use App\Models\Material;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
diff --git a/app/Services/Admin/Manage/ScheduleService.php b/app/Services/Admin/Manage/Academic/ScheduleService.php
similarity index 96%
rename from app/Services/Admin/Manage/ScheduleService.php
rename to app/Services/Admin/Manage/Academic/ScheduleService.php
index 23cc88b..6aac1fc 100644
--- a/app/Services/Admin/Manage/ScheduleService.php
+++ b/app/Services/Admin/Manage/Academic/ScheduleService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Academic;
 
 use App\Models\Schedule;
 use Illuminate\Database\Eloquent\Collection;
diff --git a/app/Services/Admin/Manage/SubmissionService.php b/app/Services/Admin/Manage/Academic/SubmissionService.php
similarity index 97%
rename from app/Services/Admin/Manage/SubmissionService.php
rename to app/Services/Admin/Manage/Academic/SubmissionService.php
index f4964d7..7c2de75 100644
--- a/app/Services/Admin/Manage/SubmissionService.php
+++ b/app/Services/Admin/Manage/Academic/SubmissionService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Academic;
 
 use App\Models\Assignment;
 use App\Models\Student;
diff --git a/app/Services/Admin/Manage/AnnouncementService.php b/app/Services/Admin/Manage/Announcement/AnnouncementService.php
similarity index 96%
rename from app/Services/Admin/Manage/AnnouncementService.php
rename to app/Services/Admin/Manage/Announcement/AnnouncementService.php
index 617f491..f8066be 100644
--- a/app/Services/Admin/Manage/AnnouncementService.php
+++ b/app/Services/Admin/Manage/Announcement/AnnouncementService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Announcement;
 
 use App\Models\Announcement;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
diff --git a/app/Services/Admin/Manage/ClassEnrollmentService.php b/app/Services/Admin/Manage/Course/ClassEnrollmentService.php
similarity index 96%
rename from app/Services/Admin/Manage/ClassEnrollmentService.php
rename to app/Services/Admin/Manage/Course/ClassEnrollmentService.php
index 3f22136..91f5262 100644
--- a/app/Services/Admin/Manage/ClassEnrollmentService.php
+++ b/app/Services/Admin/Manage/Course/ClassEnrollmentService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Course;
 
 use App\Models\ClassEnrollment;
 use App\Models\CourseClass;
diff --git a/app/Services/Admin/Manage/CourseClassService.php b/app/Services/Admin/Manage/Course/CourseClassService.php
similarity index 97%
rename from app/Services/Admin/Manage/CourseClassService.php
rename to app/Services/Admin/Manage/Course/CourseClassService.php
index bbb54d9..d2ea48e 100644
--- a/app/Services/Admin/Manage/CourseClassService.php
+++ b/app/Services/Admin/Manage/Course/CourseClassService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Course;
 
 use App\Models\CourseClass;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
diff --git a/app/Services/Admin/Manage/CourseService.php b/app/Services/Admin/Manage/Course/CourseService.php
similarity index 96%
rename from app/Services/Admin/Manage/CourseService.php
rename to app/Services/Admin/Manage/Course/CourseService.php
index 2a42ef1..1f8b60d 100644
--- a/app/Services/Admin/Manage/CourseService.php
+++ b/app/Services/Admin/Manage/Course/CourseService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Course;
 
 use App\Models\Course;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
diff --git a/app/Services/Admin/Manage/TuitionInvoiceService.php b/app/Services/Admin/Manage/Finance/TuitionInvoiceService.php
similarity index 97%
rename from app/Services/Admin/Manage/TuitionInvoiceService.php
rename to app/Services/Admin/Manage/Finance/TuitionInvoiceService.php
index 56289f1..9a172c3 100644
--- a/app/Services/Admin/Manage/TuitionInvoiceService.php
+++ b/app/Services/Admin/Manage/Finance/TuitionInvoiceService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Finance;
 
 use App\Models\TuitionInvoice;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
diff --git a/app/Services/Admin/Manage/TuitionPaymentService.php b/app/Services/Admin/Manage/Finance/TuitionPaymentService.php
similarity index 97%
rename from app/Services/Admin/Manage/TuitionPaymentService.php
rename to app/Services/Admin/Manage/Finance/TuitionPaymentService.php
index 4997db0..3ce7347 100644
--- a/app/Services/Admin/Manage/TuitionPaymentService.php
+++ b/app/Services/Admin/Manage/Finance/TuitionPaymentService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Finance;
 
 use App\Models\TuitionInvoice;
 use App\Models\TuitionPayment;
diff --git a/app/Services/Admin/Manage/AcademicAdvisingLogService.php b/app/Services/Admin/Manage/Service/AcademicAdvisingLogService.php
similarity index 97%
rename from app/Services/Admin/Manage/AcademicAdvisingLogService.php
rename to app/Services/Admin/Manage/Service/AcademicAdvisingLogService.php
index 6950e82..d33153d 100644
--- a/app/Services/Admin/Manage/AcademicAdvisingLogService.php
+++ b/app/Services/Admin/Manage/Service/AcademicAdvisingLogService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Service;
 
 use App\Models\AcademicAdvisingLog;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
diff --git a/app/Services/Admin/Manage/LetterRequestService.php b/app/Services/Admin/Manage/Service/LetterRequestService.php
similarity index 98%
rename from app/Services/Admin/Manage/LetterRequestService.php
rename to app/Services/Admin/Manage/Service/LetterRequestService.php
index 8dbacc2..f08baf1 100644
--- a/app/Services/Admin/Manage/LetterRequestService.php
+++ b/app/Services/Admin/Manage/Service/LetterRequestService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin\Manage;
+namespace App\Services\Admin\Manage\Service;
 
 use App\Enums\LetterStatus;
 use App\Models\LetterRequest;
diff --git a/docs/code-style.md b/docs/code-style.md
index 2b4315a..c932836 100644
--- a/docs/code-style.md
+++ b/docs/code-style.md
@@ -139,6 +139,28 @@ ## 4. Struktur modul Admin ✅
 Halaman CRUD frontend memakai pola: `PageHeader` (judul + tombol Tambah) →
 `FormDialog` (Create/Edit) → `DataTable` + `columns.tsx` → `DeleteConfirmDialog`.
 
+### 4.1 Sub-namespace di dalam `Admin\Manage`
+
+`Admin\Manage` sendiri dipecah lagi jadi 5 sub-namespace, mengikuti
+pengelompokan yang sama seperti grup di `app-sidebar.tsx` (Kelas, Kelola,
+Pengumuman, Keuangan, Layanan). **URL/nama route tidak berubah** (tetap flat
+`admin/manage/*` / `admin.manage.*`) — hanya struktur folder PHP-nya
+(Controller, Request, Service) yang mengikuti sub-namespace ini.
+
+| Sub-namespace               | Grup sidebar | Resource                                                                   |
+| --------------------------- | ------------ | -------------------------------------------------------------------------- |
+| `Admin\Manage\Course`       | Kelola       | Course, CourseClass, ClassEnrollment                                       |
+| `Admin\Manage\Academic`     | Kelas        | CourseRegistration, Material, Assignment, Submission, Schedule, Attendance |
+| `Admin\Manage\Announcement` | Pengumuman   | Announcement                                                               |
+| `Admin\Manage\Finance`      | Keuangan     | TuitionInvoice, TuitionPayment                                             |
+| `Admin\Manage\Service`      | Layanan      | LetterRequest, AcademicAdvisingLog                                         |
+
+Kalau menambah resource baru di salah satu grup ini, taruh Controller di
+`app/Http/Controllers/Admin/Manage/<SubNamespace>/`, Request-nya di
+`app/Http/Requests/Admin/Manage/<SubNamespace>/`, dan Service-nya di
+`app/Services/Admin/Manage/<SubNamespace>/` — jangan taruh langsung di
+`Admin\Manage` tanpa sub-namespace lagi.
+
 ---
 
 ## 5. Wayfinder ✅
diff --git a/routes/admin.php b/routes/admin.php
index c1b46a4..1843585 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -1,20 +1,20 @@
 <?php
 
 use App\Http\Controllers\Admin\FeedbackController;
-use App\Http\Controllers\Admin\Manage\AcademicAdvisingLogController;
-use App\Http\Controllers\Admin\Manage\AnnouncementController;
-use App\Http\Controllers\Admin\Manage\AssignmentController;
-use App\Http\Controllers\Admin\Manage\AttendanceController;
-use App\Http\Controllers\Admin\Manage\ClassEnrollmentController;
-use App\Http\Controllers\Admin\Manage\CourseClassController;
-use App\Http\Controllers\Admin\Manage\CourseController;
-use App\Http\Controllers\Admin\Manage\CourseRegistrationController;
-use App\Http\Controllers\Admin\Manage\LetterRequestController;
-use App\Http\Controllers\Admin\Manage\MaterialController;
-use App\Http\Controllers\Admin\Manage\ScheduleController;
-use App\Http\Controllers\Admin\Manage\SubmissionController;
-use App\Http\Controllers\Admin\Manage\TuitionInvoiceController;
-use App\Http\Controllers\Admin\Manage\TuitionPaymentController;
+use App\Http\Controllers\Admin\Manage\Academic\AssignmentController;
+use App\Http\Controllers\Admin\Manage\Academic\AttendanceController;
+use App\Http\Controllers\Admin\Manage\Academic\CourseRegistrationController;
+use App\Http\Controllers\Admin\Manage\Academic\MaterialController;
+use App\Http\Controllers\Admin\Manage\Academic\ScheduleController;
+use App\Http\Controllers\Admin\Manage\Academic\SubmissionController;
+use App\Http\Controllers\Admin\Manage\Announcement\AnnouncementController;
+use App\Http\Controllers\Admin\Manage\Course\ClassEnrollmentController;
+use App\Http\Controllers\Admin\Manage\Course\CourseClassController;
+use App\Http\Controllers\Admin\Manage\Course\CourseController;
+use App\Http\Controllers\Admin\Manage\Finance\TuitionInvoiceController;
+use App\Http\Controllers\Admin\Manage\Finance\TuitionPaymentController;
+use App\Http\Controllers\Admin\Manage\Service\AcademicAdvisingLogController;
+use App\Http\Controllers\Admin\Manage\Service\LetterRequestController;
 use App\Http\Controllers\Admin\Master\AcademicTermController;
 use App\Http\Controllers\Admin\Master\DepartmentController;
 use App\Http\Controllers\Admin\Settings\ProfileController;