structure simplified

3 files changed, 10 insertions, 10 deletions

diff --git a/public/app/extends/Cache_service.php b/public/app/extends/Cache_service.php
index 52311f3..c435b75 100644
--- a/public/app/extends/Cache_service.php
+++ b/public/app/extends/Cache_service.php
@@ -1,8 +1,8 @@
 <?php 
 namespace app\extends;
 
-use app\models\cms\Course_model;
-use app\models\admin\Privilege_model;
+use app\models\Cms_model;
+use app\models\Access_model;
 
 /** Cache service
  * -----------------------------------------------------------------------------
@@ -20,7 +20,7 @@ class Cache_service
     public static function courses_struct( $options = 0 )
     {
         return proxy(                  // cache-get courses
-            [\app\models\cms\Course_model::class, 'courses_struct'],
+            [\app\models\Cms_model::class, 'courses_struct'],
             [], CACHE_ROOT_TTL,
             $options
         );
@@ -29,7 +29,7 @@ class Cache_service
     public static function files_attributes( $options = 0 )
     {
         return  proxy(
-            [\app\models\cms\Course_model::class, 'files'],
+            [\app\models\Cms_model::class, 'files'],
             [], CACHE_ROOT_TTL,
             $options
         );
@@ -39,7 +39,7 @@ class Cache_service
     public static function privileges_hierarchy( $options = 0 )
     {
         return proxy(
-            [\app\models\admin\Privilege_model::class, 'privileges'],
+            [\app\models\Access_model::class, 'privileges'],
             [], CACHE_ROOT_TTL,
             $options
         );
@@ -48,7 +48,7 @@ class Cache_service
     public static function pages_list( $options = 0 )
     {
         return proxy(
-            [\app\models\cms\Course_model::class, 'pages'],
+            [\app\models\Cms_model::class, 'pages'],
             [], CACHE_ROOT_TTL,
             $options
         );
@@ -72,7 +72,7 @@ class Cache_service
 
         // TODO: needs testing before release
         // return proxy(
-        //     [\app\models\admin\Course_model::class, $entity],
+        //     [\app\models\Cms_model::class, $entity],
         //     [], CACHE_ROOT_TTL,
         //     $options
         // );
diff --git a/public/app/extends/Classroom_manager.php b/public/app/extends/Classroom_manager.php
index 4d38ba3..ea2e891 100644
--- a/public/app/extends/Classroom_manager.php
+++ b/public/app/extends/Classroom_manager.php
@@ -37,7 +37,7 @@ class Classroom_manager extends UserManager
     public function register_user()
     {
         $req = Registry::get('REQUEST');
-        $register = User_model::registerUser($req->POST);
+        $register = Access_model::registerUser($req->POST);
 
         if ($register['success']) {
             
@@ -83,7 +83,7 @@ class Classroom_manager extends UserManager
     public function create_OTP($id)
     {
         $otp = rand(100000,999999);
-        User_model::set_OTP($id, $otp);
+        Access_model::set_OTP($id, $otp);
 
         return true;
     }
diff --git a/public/app/extends/Send_mail.php b/public/app/extends/SendMail_service.php
index 52eab53..c717e61 100644
--- a/public/app/extends/Send_mail.php
+++ b/public/app/extends/SendMail_service.php
@@ -6,7 +6,7 @@ use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\Exception;
 
 
-class Send_mail
+class SendMail_service
 {
     /** send_activation_code
      *