diff --git a/application/controllers/Admins.php b/application/controllers/Admins.php
index 6c6ffd01..b9e1d5f7 100644
--- a/application/controllers/Admins.php
+++ b/application/controllers/Admins.php
@@ -52,7 +52,7 @@ class Admins extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/admins/admins_page', [
+        $this->load->view('pages/admins_page', [
             'page_title' => lang('admins'),
             'active_menu' => PRIV_USERS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/Backend.php b/application/controllers/Backend.php
index acbfb43c..18b98784 100755
--- a/application/controllers/Backend.php
+++ b/application/controllers/Backend.php
@@ -105,7 +105,7 @@ class Backend extends EA_Controller {
             $view['edit_appointment'] = NULL;
         }
 
-        $this->load->view('pages/calendar/calendar_page', $view);
+        $this->load->view('pages/calendar_page', $view);
     }
 
     /**
@@ -208,7 +208,7 @@ class Backend extends EA_Controller {
 
         $this->set_user_data($view);
 
-        $this->load->view('pages/customers/customers_page', $view);
+        $this->load->view('pages/customers_page', $view);
     }
 
     /**
@@ -241,7 +241,7 @@ class Backend extends EA_Controller {
         $view['timezones'] = $this->timezones->to_array();
         $this->set_user_data($view);
 
-        $this->load->view('pages/services/services_page', $view);
+        $this->load->view('pages/services_page', $view);
     }
 
     /**
@@ -276,7 +276,7 @@ class Backend extends EA_Controller {
         $view['working_plan_exceptions'] = '{}';
         $this->set_user_data($view);
 
-        $this->load->view('pages/users/users_page', $view);
+        $this->load->view('pages/users_page', $view);
     }
 
     /**
@@ -320,7 +320,7 @@ class Backend extends EA_Controller {
 
         $this->set_user_data($view);
 
-        $this->load->view('pages/settings/settings_page', $view);
+        $this->load->view('pages/settings_page', $view);
     }
 
     /**
@@ -350,6 +350,6 @@ class Backend extends EA_Controller {
             $view = ['success' => FALSE, 'exception' => $e->getMessage()];
         }
 
-        $this->load->view('pages/instance/instance_update_page', $view);
+        $this->load->view('pages/instance_update_page', $view);
     }
 }
diff --git a/application/controllers/Booking.php b/application/controllers/Booking.php
index 9e3ea586..2ff0815f 100755
--- a/application/controllers/Booking.php
+++ b/application/controllers/Booking.php
@@ -110,7 +110,7 @@ class Booking extends EA_Controller {
             if (empty($results))
             {
                 // The requested appointment was not found in the database. 
-                $this->load->view('pages/booking/booking_message_page', [
+                $this->load->view('pages/booking_message_page', [
                     'message_title' => lang('appointment_not_found'),
                     'message_text' => lang('appointment_does_not_exist_in_db'),
                     'message_icon' => base_url('assets/img/error.png')
@@ -130,7 +130,7 @@ class Booking extends EA_Controller {
                 $hours = floor($book_advance_timeout / 60);
                 $minutes = ($book_advance_timeout % 60);
 
-                $this->load->view('pages/booking/booking_message_page', [
+                $this->load->view('pages/booking_message_page', [
                     'message_title' => lang('appointment_locked'),
                     'message_text' => strtr(lang('appointment_locked_message'), [
                         '{$limit}' => sprintf('%02d:%02d', $hours, $minutes)
@@ -163,7 +163,7 @@ class Booking extends EA_Controller {
             $customer = [];
         }
 
-        $this->load->view('pages/booking/booking_page', [
+        $this->load->view('pages/booking_page', [
             'available_services' => $available_services,
             'available_providers' => $available_providers,
             'company_name' => $company_name,
@@ -238,7 +238,7 @@ class Booking extends EA_Controller {
             $exceptions[] = $e;
         }
 
-        $this->load->view('pages/booking/booking_message_page', [
+        $this->load->view('pages/booking_message_page', [
             'message_title' => lang('appointment_cancelled_title'),
             'message_text' => lang('appointment_cancelled'),
             'message_icon' => base_url('assets/img/success.png'),
@@ -278,7 +278,7 @@ class Booking extends EA_Controller {
 
         $exceptions = $this->session->flashdata('book_success') ?? [];
 
-        $this->load->view('pages/booking/booking_success_page', [
+        $this->load->view('pages/booking_success_page', [
             'page_title' => lang('success'),
             'appointment_data' => $appointment,
             'provider_data' => [
diff --git a/application/controllers/Calendar.php b/application/controllers/Calendar.php
index 5f303482..f8cfcc5d 100644
--- a/application/controllers/Calendar.php
+++ b/application/controllers/Calendar.php
@@ -95,7 +95,7 @@ class Calendar extends EA_Controller {
             $this->appointments_model->load($edit_appointment, ['customer']);
         }
 
-        $this->load->view('pages/calendar/calendar_page', [
+        $this->load->view('pages/calendar_page', [
             'page_title' => lang('calendar'),
             'active_menu' => PRIV_APPOINTMENTS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/Customers.php b/application/controllers/Customers.php
index 6e3f98ec..8c65cf75 100644
--- a/application/controllers/Customers.php
+++ b/application/controllers/Customers.php
@@ -53,7 +53,7 @@ class Customers extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/customers/customers_page', [
+        $this->load->view('pages/customers_page', [
             'page_title' => lang('customers'),
             'active_menu' => PRIV_CUSTOMERS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/Installation.php b/application/controllers/Installation.php
index 46c8e81d..c627011d 100644
--- a/application/controllers/Installation.php
+++ b/application/controllers/Installation.php
@@ -46,7 +46,7 @@ class Installation extends EA_Controller {
             return;
         }
 
-        $this->load->view('pages/instance/instance_installation_page', [
+        $this->load->view('pages/instance_installation_page', [
             'base_url' => config('base_url')
         ]);
     }
diff --git a/application/controllers/Providers.php b/application/controllers/Providers.php
index 578622fa..e7f1684e 100644
--- a/application/controllers/Providers.php
+++ b/application/controllers/Providers.php
@@ -53,7 +53,7 @@ class Providers extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/providers/providers_page', [
+        $this->load->view('pages/providers_page', [
             'page_title' => lang('providers'),
             'active_menu' => PRIV_USERS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/Secretaries.php b/application/controllers/Secretaries.php
index f77d8538..d04f722b 100644
--- a/application/controllers/Secretaries.php
+++ b/application/controllers/Secretaries.php
@@ -53,7 +53,7 @@ class Secretaries extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/secretaries/secretaries_page', [
+        $this->load->view('pages/secretaries_page', [
             'page_title' => lang('secretaries'),
             'active_menu' => PRIV_USERS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/Service_categories.php b/application/controllers/Service_categories.php
index 0bcfd7bc..a718a8a9 100644
--- a/application/controllers/Service_categories.php
+++ b/application/controllers/Service_categories.php
@@ -52,7 +52,7 @@ class Service_categories extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/service_categories/service_categories_page', [
+        $this->load->view('pages/service_categories_page', [
             'page_title' => lang('services'),
             'active_menu' => PRIV_SERVICES,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/Services.php b/application/controllers/Services.php
index 061dba62..fa2b27f6 100644
--- a/application/controllers/Services.php
+++ b/application/controllers/Services.php
@@ -52,7 +52,7 @@ class Services extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/services/services_page', [
+        $this->load->view('pages/services_page', [
             'page_title' => lang('services'),
             'active_menu' => PRIV_SERVICES,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/User.php b/application/controllers/User.php
index 9eb6a8dc..a7cd164c 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -43,7 +43,7 @@ class User extends EA_Controller {
      */
     public function login()
     {
-        $this->load->view('pages/account/account_login_page', [
+        $this->load->view('pages/account_login_page', [
             'base_url' => config('base_url'),
             'company_name' => setting('company_name'),
             'dest_url' => session('dest_url', site_url('backend'))
@@ -57,7 +57,7 @@ class User extends EA_Controller {
     {
         $this->session->sess_destroy();
 
-        $this->load->view('pages/account/account_logout_page', [
+        $this->load->view('pages/account_logout_page', [
             'base_url' => config('base_url'),
             'company_name' => setting('company_name')
         ]);
@@ -68,7 +68,7 @@ class User extends EA_Controller {
      */
     public function forgot_password()
     {
-        $this->load->view('pages/account/account_recovery_page', [
+        $this->load->view('pages/account_recovery_page', [
             'base_url' => config('base_url'),
             'company_name' => setting('company_name')
         ]);
@@ -79,7 +79,7 @@ class User extends EA_Controller {
      */
     public function no_permissions()
     {
-        $this->load->view('user/no_privileges', [
+        $this->load->view('pages/account_no_permissions_page', [
             'base_url' => config('base_url'),
             'company_name' => setting('company_name')
         ]);
diff --git a/application/controllers/settings/About.php b/application/controllers/settings/About.php
index e00b6de3..6891d5f2 100644
--- a/application/controllers/settings/About.php
+++ b/application/controllers/settings/About.php
@@ -68,7 +68,7 @@ class About extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/settings/about/about_page', [
+        $this->load->view('pages/settings/about_page', [
             'page_title' => lang('settings'),
             'active_menu' => PRIV_SYSTEM_SETTINGS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/settings/Business_logic.php b/application/controllers/settings/Business_logic.php
index 1142e28e..a5ed5428 100644
--- a/application/controllers/settings/Business_logic.php
+++ b/application/controllers/settings/Business_logic.php
@@ -68,7 +68,7 @@ class Business_logic extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/settings/business_logic/business_logic_page', [
+        $this->load->view('pages/settings/business_logic_page', [
             'page_title' => lang('settings'),
             'active_menu' => PRIV_SYSTEM_SETTINGS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/settings/Client_form.php b/application/controllers/settings/Client_form.php
index d431783e..48a0d4a6 100644
--- a/application/controllers/settings/Client_form.php
+++ b/application/controllers/settings/Client_form.php
@@ -68,7 +68,7 @@ class Client_form extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/settings/client_form/client_form_page', [
+        $this->load->view('pages/settings/client_form_page', [
             'page_title' => lang('settings'),
             'active_menu' => PRIV_SYSTEM_SETTINGS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/settings/Current_user.php b/application/controllers/settings/Current_user.php
index 10af7573..3cc72116 100644
--- a/application/controllers/settings/Current_user.php
+++ b/application/controllers/settings/Current_user.php
@@ -68,7 +68,7 @@ class Current_user extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/settings/current_user/current_user_page', [
+        $this->load->view('pages/settings/current_user_page', [
             'page_title' => lang('settings'),
             'active_menu' => PRIV_SYSTEM_SETTINGS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/settings/General.php b/application/controllers/settings/General.php
index 7278b715..998e303d 100644
--- a/application/controllers/settings/General.php
+++ b/application/controllers/settings/General.php
@@ -68,7 +68,7 @@ class General extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/settings/general/general_page', [
+        $this->load->view('pages/settings/general_page', [
             'page_title' => lang('settings'),
             'active_menu' => PRIV_SYSTEM_SETTINGS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/controllers/settings/Legal_contents.php b/application/controllers/settings/Legal_contents.php
index 4d9c50f2..350a7acc 100644
--- a/application/controllers/settings/Legal_contents.php
+++ b/application/controllers/settings/Legal_contents.php
@@ -68,7 +68,7 @@ class Legal_contents extends EA_Controller {
 
         $role_slug = session('role_slug');
 
-        $this->load->view('pages/settings/legal_contents/legal_contents_page', [
+        $this->load->view('pages/settings/legal_contents_page', [
             'page_title' => lang('settings'),
             'active_menu' => PRIV_SYSTEM_SETTINGS,
             'user_display_name' => $this->accounts->get_user_display_name($user_id),
diff --git a/application/migrations/001_specific_calendar_sync.php b/application/migrations/001_specific_calendar_sync.php
index 47232d27..0aac25ff 100644
--- a/application/migrations/001_specific_calendar_sync.php
+++ b/application/migrations/001_specific_calendar_sync.php
@@ -232,7 +232,7 @@ class Migration_Specific_calendar_sync extends EA_Migration {
         ]);
         $this->dbforge->add_key('id', TRUE);
         $this->dbforge->add_key('id_service_categories');
-        $this->dbforge->create_table('service_categories', TRUE, ['engine' => 'InnoDB']);
+        $this->dbforge->create_table('Categories', TRUE, ['engine' => 'InnoDB']);
 
         $this->dbforge->add_field([
             'id' => [
@@ -395,7 +395,7 @@ class Migration_Specific_calendar_sync extends EA_Migration {
 
         $this->db->query('
             ALTER TABLE `' . $this->db->dbprefix('services') . '`
-              ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
+              ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE;
         ');
 
         $this->db->query('
@@ -494,7 +494,7 @@ class Migration_Specific_calendar_sync extends EA_Migration {
         $this->dbforge->drop_table('roles');
         $this->dbforge->drop_table('secretaries_providers');
         $this->dbforge->drop_table('services');
-        $this->dbforge->drop_table('service_categories');
+        $this->dbforge->drop_table('Categories');
         $this->dbforge->drop_table('services_providers');
         $this->dbforge->drop_table('settings');
         $this->dbforge->drop_table('user_settings');
diff --git a/application/migrations/009_change_column_types.php b/application/migrations/009_change_column_types.php
index 8764afd3..7ef82d51 100644
--- a/application/migrations/009_change_column_types.php
+++ b/application/migrations/009_change_column_types.php
@@ -157,7 +157,7 @@ class Migration_Change_column_types extends EA_Migration {
             ]
         ];
 
-        $this->dbforge->modify_column('service_categories', $fields);
+        $this->dbforge->modify_column('Categories', $fields);
 
         // Settings
         $fields = [
@@ -210,7 +210,7 @@ class Migration_Change_column_types extends EA_Migration {
             ADD CONSTRAINT `fk_' . $this->db->dbprefix('secretaries_providers') . '_2` FOREIGN KEY (`id_users_provider`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE');
 
         $this->db->query('ALTER TABLE `' . $this->db->dbprefix('services') . '`
-            ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
+            ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
 
         $this->db->query('ALTER TABLE `' . $this->db->dbprefix('services_providers') . '`
             ADD CONSTRAINT `' . $this->db->dbprefix('services_providers') . '_ibfk_1` FOREIGN KEY (`id_users`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -371,7 +371,7 @@ class Migration_Change_column_types extends EA_Migration {
             ]
         ];
 
-        $this->dbforge->modify_column('service_categories', $fields);
+        $this->dbforge->modify_column('Categories', $fields);
 
         // Settings
         $fields = [
@@ -424,7 +424,7 @@ class Migration_Change_column_types extends EA_Migration {
             ADD CONSTRAINT `fk_' . $this->db->dbprefix('secretaries_providers') . '_2` FOREIGN KEY (`id_users_provider`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE');
 
         $this->db->query('ALTER TABLE `' . $this->db->dbprefix('services') . '`
-            ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
+            ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
 
         $this->db->query('ALTER TABLE `' . $this->db->dbprefix('services_providers') . '`
             ADD CONSTRAINT `' . $this->db->dbprefix('services_providers') . '_ibfk_1` FOREIGN KEY (`id_users`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
diff --git a/application/migrations/011_remove_prefix_from_fkey_constraints.php b/application/migrations/011_remove_prefix_from_fkey_constraints.php
index 242c4016..18349b9b 100644
--- a/application/migrations/011_remove_prefix_from_fkey_constraints.php
+++ b/application/migrations/011_remove_prefix_from_fkey_constraints.php
@@ -50,7 +50,7 @@ class Migration_Remove_prefix_from_fkey_constraints extends EA_Migration {
             ON UPDATE CASCADE');
 
         $this->db->query('ALTER TABLE `' . $this->db->dbprefix('services') . '`
-            ADD CONSTRAINT `services_service_categories` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`)
+            ADD CONSTRAINT `services_service_categories` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`)
             ON DELETE SET NULL
             ON UPDATE CASCADE');
 
@@ -101,7 +101,7 @@ class Migration_Remove_prefix_from_fkey_constraints extends EA_Migration {
             ADD CONSTRAINT `fk_' . $this->db->dbprefix('secretaries_providers') . '_2` FOREIGN KEY (`id_users_provider`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE');
 
         $this->db->query('ALTER TABLE `' . $this->db->dbprefix('services') . '`
-            ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('service_categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
+            ADD CONSTRAINT `' . $this->db->dbprefix('services') . '_ibfk_1` FOREIGN KEY (`id_service_categories`) REFERENCES `' . $this->db->dbprefix('Categories') . '` (`id`) ON DELETE SET NULL ON UPDATE CASCADE');
 
         $this->db->query('ALTER TABLE `' . $this->db->dbprefix('services_providers') . '`
             ADD CONSTRAINT `' . $this->db->dbprefix('services_providers') . '_ibfk_1` FOREIGN KEY (`id_users`) REFERENCES `' . $this->db->dbprefix('users') . '` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
diff --git a/application/views/layouts/account/account_layout.php b/application/views/layouts/account_layout.php
similarity index 97%
rename from application/views/layouts/account/account_layout.php
rename to application/views/layouts/account_layout.php
index 8186c9ba..d0c50884 100644
--- a/application/views/layouts/account/account_layout.php
+++ b/application/views/layouts/account_layout.php
@@ -18,7 +18,7 @@
 
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/bootstrap.css') ?>">
-    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/account/account_layout.css') ?>">
+    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/account_layout.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
 
     <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
diff --git a/application/views/layouts/backend/backend_footer.php b/application/views/layouts/backend_footer.php
similarity index 100%
rename from application/views/layouts/backend/backend_footer.php
rename to application/views/layouts/backend_footer.php
diff --git a/application/views/layouts/backend/backend_header.php b/application/views/layouts/backend_header.php
similarity index 100%
rename from application/views/layouts/backend/backend_header.php
rename to application/views/layouts/backend_header.php
diff --git a/application/views/layouts/backend/backend_layout.php b/application/views/layouts/backend_layout.php
similarity index 95%
rename from application/views/layouts/backend/backend_layout.php
rename to application/views/layouts/backend_layout.php
index d78c8ba3..91403cfb 100644
--- a/application/views/layouts/backend/backend_layout.php
+++ b/application/views/layouts/backend_layout.php
@@ -20,7 +20,7 @@
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/trumbowyg/trumbowyg.min.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/select2/select2.min.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/bootstrap.css') ?>">
-    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/backend/backend_layout.css') ?>">
+    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/backend_layout.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
     <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
     <link rel="icon" sizes="192x192" href="<?= asset_url('assets/img/logo.png') ?>">
@@ -47,7 +47,7 @@
     <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/solid.min.js') ?>"></script>
 </head>
 <body>
-<script src="<?= asset_url('assets/js/layouts/backend/backend.js') ?>"></script>
+<script src="<?= asset_url('assets/js/layouts/backend.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
 
 <?php require 'backend_header.php' ?>
diff --git a/application/views/layouts/booking/booking_footer.php b/application/views/layouts/booking_footer.php
similarity index 100%
rename from application/views/layouts/booking/booking_footer.php
rename to application/views/layouts/booking_footer.php
diff --git a/application/views/layouts/booking/booking_header.php b/application/views/layouts/booking_header.php
similarity index 100%
rename from application/views/layouts/booking/booking_header.php
rename to application/views/layouts/booking_header.php
diff --git a/application/views/layouts/booking/booking_layout.php b/application/views/layouts/booking_layout.php
similarity index 95%
rename from application/views/layouts/booking/booking_layout.php
rename to application/views/layouts/booking_layout.php
index 18907ab6..768ed9db 100644
--- a/application/views/layouts/booking/booking_layout.php
+++ b/application/views/layouts/booking_layout.php
@@ -32,7 +32,7 @@
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/cookieconsent/cookieconsent.min.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/bootstrap.css') ?>">
-    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/booking/booking_layout.css') ?>">
+    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/booking_layout.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
 
     <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
@@ -100,8 +100,8 @@
 <script src="<?= asset_url('assets/vendor/moment/moment.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/moment-timezone/moment-timezone-with-data.min.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/booking/frontend_book_api.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/booking/frontend_book.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/frontend_book_api.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/frontend_book.js') ?>"></script>
 
 <script>
     $(function () {
diff --git a/application/views/layouts/message/message_layout.php b/application/views/layouts/message_layout.php
similarity index 97%
rename from application/views/layouts/message/message_layout.php
rename to application/views/layouts/message_layout.php
index 2eafda3d..30ae2c07 100644
--- a/application/views/layouts/message/message_layout.php
+++ b/application/views/layouts/message_layout.php
@@ -15,7 +15,7 @@
     <link rel="icon" href="<?= asset_url('assets/img/logo.png') ?>" sizes="192x192" type="image/png">
     <title><?= $page_title ?> | Easy!Appointments</title>
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/bootstrap.css') ?>">
-    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/booking/booking_layout.css') ?>">
+    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/layouts/booking_layout.css') ?>">
     
     <?php slot('meta') ?>
     
diff --git a/application/views/pages/account/account_login_page.php b/application/views/pages/account_login_page.php
similarity index 93%
rename from application/views/pages/account/account_login_page.php
rename to application/views/pages/account_login_page.php
index 5d2f5d85..2b7777e2 100644
--- a/application/views/pages/account/account_login_page.php
+++ b/application/views/pages/account_login_page.php
@@ -5,7 +5,7 @@
  */
 ?>
 
-<?php extend('layouts/account/account_layout') ?>
+<?php extend('layouts/account_layout') ?>
 
 <?php section('content') ?>
 
@@ -51,6 +51,6 @@
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/fontawesome.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/solid.min.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
-<script src="<?= asset_url('assets/js/login.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/login.js') ?>"></script>
 
 <?php section('scripts') ?>
diff --git a/application/views/pages/account/account_logout_page.php b/application/views/pages/account_logout_page.php
similarity index 90%
rename from application/views/pages/account/account_logout_page.php
rename to application/views/pages/account_logout_page.php
index fd449730..c22e0945 100644
--- a/application/views/pages/account/account_logout_page.php
+++ b/application/views/pages/account_logout_page.php
@@ -1,4 +1,4 @@
-<?php extend('layouts/account/account_layout') ?>
+<?php extend('layouts/account_layout') ?>
 
 <?php section('content') ?>
 
diff --git a/application/views/pages/account/account_no_permissions_page.php b/application/views/pages/account_no_permissions_page.php
similarity index 86%
rename from application/views/pages/account/account_no_permissions_page.php
rename to application/views/pages/account_no_permissions_page.php
index 2582a967..25e9ef4b 100644
--- a/application/views/pages/account/account_no_permissions_page.php
+++ b/application/views/pages/account_no_permissions_page.php
@@ -1,4 +1,4 @@
-<?php extend('layouts/account/account_layout') ?>
+<?php extend('layouts/account_layout') ?>
 
 <?php section('content') ?>
 
diff --git a/application/views/pages/account/account_recovery_page.php b/application/views/pages/account_recovery_page.php
similarity index 94%
rename from application/views/pages/account/account_recovery_page.php
rename to application/views/pages/account_recovery_page.php
index 6a9bb9fd..57dd4778 100644
--- a/application/views/pages/account/account_recovery_page.php
+++ b/application/views/pages/account_recovery_page.php
@@ -1,4 +1,4 @@
-<?php extend('layouts/account/account_layout') ?>
+<?php extend('layouts/account_layout') ?>
 
 <?php section('content') ?>
 
diff --git a/application/views/pages/admins/admins_page.php b/application/views/pages/admins_page.php
similarity index 97%
rename from application/views/pages/admins/admins_page.php
rename to application/views/pages/admins_page.php
index b98c5d6a..6d47b0ed 100755
--- a/application/views/pages/admins/admins_page.php
+++ b/application/views/pages/admins_page.php
@@ -5,12 +5,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/admins/backend_admins_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/admins/backend_admins.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_admins_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_admins.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/booking/booking_cancellation.php b/application/views/pages/booking_cancellation.php
similarity index 100%
rename from application/views/pages/booking/booking_cancellation.php
rename to application/views/pages/booking_cancellation.php
diff --git a/application/views/pages/booking/booking_message_page.php b/application/views/pages/booking_message_page.php
similarity index 86%
rename from application/views/pages/booking/booking_message_page.php
rename to application/views/pages/booking_message_page.php
index 0fc93660..ff7d8a88 100644
--- a/application/views/pages/booking/booking_message_page.php
+++ b/application/views/pages/booking_message_page.php
@@ -6,7 +6,7 @@
  */
 ?>
 
-<?php extend('layouts/message/message_layout') ?>
+<?php extend('layouts/message_layout') ?>
 
 <?php section('content') ?>
 
diff --git a/application/views/pages/booking/booking_page.php b/application/views/pages/booking_page.php
similarity index 95%
rename from application/views/pages/booking/booking_page.php
rename to application/views/pages/booking_page.php
index 739d55eb..898f7fc5 100755
--- a/application/views/pages/booking/booking_page.php
+++ b/application/views/pages/booking_page.php
@@ -20,7 +20,7 @@
  */
 ?>
 
-<?php extend('layouts/booking/booking_layout') ?>
+<?php extend('layouts/booking_layout') ?>
 
 <?php section('content') ?>
 
diff --git a/application/views/pages/booking/booking_step_1.php b/application/views/pages/booking_step_1.php
similarity index 100%
rename from application/views/pages/booking/booking_step_1.php
rename to application/views/pages/booking_step_1.php
diff --git a/application/views/pages/booking/booking_step_2.php b/application/views/pages/booking_step_2.php
similarity index 100%
rename from application/views/pages/booking/booking_step_2.php
rename to application/views/pages/booking_step_2.php
diff --git a/application/views/pages/booking/booking_step_3.php b/application/views/pages/booking_step_3.php
similarity index 100%
rename from application/views/pages/booking/booking_step_3.php
rename to application/views/pages/booking_step_3.php
diff --git a/application/views/pages/booking/booking_step_4.php b/application/views/pages/booking_step_4.php
similarity index 100%
rename from application/views/pages/booking/booking_step_4.php
rename to application/views/pages/booking_step_4.php
diff --git a/application/views/pages/booking/booking_success_page.php b/application/views/pages/booking_success_page.php
similarity index 97%
rename from application/views/pages/booking/booking_success_page.php
rename to application/views/pages/booking_success_page.php
index 39c7f623..4970115e 100755
--- a/application/views/pages/booking/booking_success_page.php
+++ b/application/views/pages/booking_success_page.php
@@ -8,7 +8,7 @@
  */
 ?>
 
-<?php extend('layouts/message/message_layout') ?>
+<?php extend('layouts/message_layout') ?>
 
 <?php section('content') ?>
 
diff --git a/application/views/pages/calendar/calendar_page.php b/application/views/pages/calendar_page.php
similarity index 89%
rename from application/views/pages/calendar/calendar_page.php
rename to application/views/pages/calendar_page.php
index 67a814ab..d0cd4f9c 100755
--- a/application/views/pages/calendar/calendar_page.php
+++ b/application/views/pages/calendar_page.php
@@ -19,7 +19,7 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('styles') ?>
 
@@ -33,13 +33,13 @@
 <script src="<?= asset_url('assets/vendor/jquery-jeditable/jquery.jeditable.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js') ?>"></script>
 <script src="<?= asset_url('assets/js/components/working_plan_exceptions_modal.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_default_view.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_table_view.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_google_sync.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_appointments_modal.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_unavailability_events_modal.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/calendar/backend_calendar_api.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_calendar.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_calendar_default_view.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_calendar_table_view.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_calendar_google_sync.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_calendar_appointments_modal.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_calendar_unavailability_events_modal.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_calendar_api.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/customers/customers_page.php b/application/views/pages/customers_page.php
similarity index 97%
rename from application/views/pages/customers/customers_page.php
rename to application/views/pages/customers_page.php
index fe8a9394..283bbba6 100755
--- a/application/views/pages/customers/customers_page.php
+++ b/application/views/pages/customers_page.php
@@ -5,13 +5,13 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
 <script src="<?= asset_url('assets/vendor/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/customers/backend_customers_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/customers/backend_customers.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_customers_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_customers.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/instance/instance_installation_page.php b/application/views/pages/instance_installation_page.php
similarity index 98%
rename from application/views/pages/instance/instance_installation_page.php
rename to application/views/pages/instance_installation_page.php
index b7643ad4..39425697 100755
--- a/application/views/pages/instance/instance_installation_page.php
+++ b/application/views/pages/instance_installation_page.php
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.css') ?>">
     <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.css') ?>">
-    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/pages/instance/instance_installation_page.css') ?>">
+    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/instance_installation_page.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
 </head>
 <body>
diff --git a/application/views/pages/instance/instance_update_page.php b/application/views/pages/instance_update_page.php
similarity index 98%
rename from application/views/pages/instance/instance_update_page.php
rename to application/views/pages/instance_update_page.php
index 65672ca5..07bfcfba 100644
--- a/application/views/pages/instance/instance_update_page.php
+++ b/application/views/pages/instance_update_page.php
@@ -15,7 +15,7 @@
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.css') ?>">
     <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.css') ?>">
-    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/pages/update.css') ?>">
+    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/update.css') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/general.css') ?>">
 </head>
 <body>
diff --git a/application/views/pages/providers/providers_page.php b/application/views/pages/providers_page.php
similarity index 98%
rename from application/views/pages/providers/providers_page.php
rename to application/views/pages/providers_page.php
index 249c099b..7974d74b 100755
--- a/application/views/pages/providers/providers_page.php
+++ b/application/views/pages/providers_page.php
@@ -6,12 +6,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/providers/backend_providers_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/providers/backend_providers.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_providers_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_providers.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/working_plan.js') ?>"></script>
 <script src="<?= asset_url('assets/js/components/working_plan_exceptions_modal.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js') ?>"></script>
diff --git a/application/views/pages/secretaries/secretaries_page.php b/application/views/pages/secretaries_page.php
similarity index 97%
rename from application/views/pages/secretaries/secretaries_page.php
rename to application/views/pages/secretaries_page.php
index d6092b95..b68336fe 100755
--- a/application/views/pages/secretaries/secretaries_page.php
+++ b/application/views/pages/secretaries_page.php
@@ -6,12 +6,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/secretaries/backend_secretaries_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/secretaries/backend_secretaries.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_secretaries_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_secretaries.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/service_categories/service_categories_page.php b/application/views/pages/service_categories_page.php
similarity index 94%
rename from application/views/pages/service_categories/service_categories_page.php
rename to application/views/pages/service_categories_page.php
index e3c41026..4d6e15bf 100755
--- a/application/views/pages/service_categories/service_categories_page.php
+++ b/application/views/pages/service_categories_page.php
@@ -5,12 +5,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/service_categories/backend_categories_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/service_categories/backend_categories.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_categories_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_categories.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/services/services_page.php b/application/views/pages/services_page.php
similarity index 96%
rename from application/views/pages/services/services_page.php
rename to application/views/pages/services_page.php
index 0771594a..78d911a5 100755
--- a/application/views/pages/services/services_page.php
+++ b/application/views/pages/services_page.php
@@ -5,12 +5,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/services/backend_services_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/services/backend_services.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_services_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_services.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/settings/about/about_page.php b/application/views/pages/settings/about_page.php
similarity index 97%
rename from application/views/pages/settings/about/about_page.php
rename to application/views/pages/settings/about_page.php
index 5edcf501..a023e78e 100755
--- a/application/views/pages/settings/about/about_page.php
+++ b/application/views/pages/settings/about_page.php
@@ -4,7 +4,7 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
diff --git a/application/views/pages/settings/business_logic/business_logic_page.php b/application/views/pages/settings/business_logic_page.php
similarity index 95%
rename from application/views/pages/settings/business_logic/business_logic_page.php
rename to application/views/pages/settings/business_logic_page.php
index 2e3110f2..0cb9ff96 100755
--- a/application/views/pages/settings/business_logic/business_logic_page.php
+++ b/application/views/pages/settings/business_logic_page.php
@@ -7,12 +7,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_business_logic_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_business_logic.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_business_logic_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_business_logic.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/working_plan.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/jquery-jeditable/jquery.jeditable.min.js') ?>"></script>
diff --git a/application/views/pages/settings/client_form/client_form_page.php b/application/views/pages/settings/client_form_page.php
similarity index 97%
rename from application/views/pages/settings/client_form/client_form_page.php
rename to application/views/pages/settings/client_form_page.php
index 82c767fc..d4a2e9d8 100755
--- a/application/views/pages/settings/client_form/client_form_page.php
+++ b/application/views/pages/settings/client_form_page.php
@@ -7,12 +7,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_client_form_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_client_form.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_client_form_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_client_form.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/settings/current_user/current_user_page.php b/application/views/pages/settings/current_user_page.php
similarity index 96%
rename from application/views/pages/settings/current_user/current_user_page.php
rename to application/views/pages/settings/current_user_page.php
index b8c59113..f1afa087 100644
--- a/application/views/pages/settings/current_user/current_user_page.php
+++ b/application/views/pages/settings/current_user_page.php
@@ -7,12 +7,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_current_user_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_current_user.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_current_user_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_current_user.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/settings/general/general_page.php b/application/views/pages/settings/general_page.php
similarity index 96%
rename from application/views/pages/settings/general/general_page.php
rename to application/views/pages/settings/general_page.php
index d4a1452a..242adef4 100755
--- a/application/views/pages/settings/general/general_page.php
+++ b/application/views/pages/settings/general_page.php
@@ -7,12 +7,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_general_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_general.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_general_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_general.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/settings/legal_contents/legal_contents_page.php b/application/views/pages/settings/legal_contents_page.php
similarity index 94%
rename from application/views/pages/settings/legal_contents/legal_contents_page.php
rename to application/views/pages/settings/legal_contents_page.php
index 37146e88..6beef3eb 100755
--- a/application/views/pages/settings/legal_contents/legal_contents_page.php
+++ b/application/views/pages/settings/legal_contents_page.php
@@ -5,12 +5,12 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_legal_contents_helper.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/settings/backend_settings_legal_contents.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_legal_contents_helper.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/backend_settings_legal_contents.js') ?>"></script>
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/pages/users/users_page.php b/application/views/users_page.php
similarity index 99%
rename from application/views/pages/users/users_page.php
rename to application/views/users_page.php
index 2a0bf8b7..5205b06b 100755
--- a/application/views/pages/users/users_page.php
+++ b/application/views/users_page.php
@@ -20,7 +20,7 @@
  */
 ?>
 
-<?php extend('layouts/backend/backend_layout') ?>
+<?php extend('layouts/backend_layout') ?>
 
 <?php section('content') ?>
 
diff --git a/assets/css/layouts/account/account_layout.scss b/assets/css/layouts/account_layout.scss
similarity index 100%
rename from assets/css/layouts/account/account_layout.scss
rename to assets/css/layouts/account_layout.scss
diff --git a/assets/css/layouts/backend/backend_layout.scss b/assets/css/layouts/backend_layout.scss
similarity index 98%
rename from assets/css/layouts/backend/backend_layout.scss
rename to assets/css/layouts/backend_layout.scss
index 29342c96..e1eabe56 100644
--- a/assets/css/layouts/backend/backend_layout.scss
+++ b/assets/css/layouts/backend_layout.scss
@@ -370,7 +370,7 @@ body legend {
 }
 
 #calendar-page #calendar .fc-unavailable {
-    background-image: url('../../../img/unavailable.jpg');
+    background-image: url('../../img/unavailable.jpg');
     font-size: 14px;
     border-radius: 0;
     font-weight: bold;
@@ -389,11 +389,11 @@ body legend {
 }
 
 #calendar-page #calendar .fc-break {
-    background-image: url('../../../img/break.jpg');
+    background-image: url('../../img/break.jpg');
 }
 
 #calendar-page #calendar .fc-custom {
-    background-image: url('../../../img/custom.jpg');
+    background-image: url('../../img/custom.jpg');
 }
 
 #calendar-page .fc-header {
@@ -533,7 +533,7 @@ body .form-horizontal .controls {
 }
 
 #calendar .fc-unavailable {
-    background: #eaeaea url('../../../img/unavailable.jpg');
+    background: #eaeaea url('../../img/unavailable.jpg');
 }
 
 #calendar .calendar-view .date-column .provider-column {
diff --git a/assets/css/layouts/booking/booking_layout.scss b/assets/css/layouts/booking_layout.scss
similarity index 100%
rename from assets/css/layouts/booking/booking_layout.scss
rename to assets/css/layouts/booking_layout.scss
diff --git a/assets/css/layouts/message/message_layout.scss b/assets/css/layouts/message_layout.scss
similarity index 100%
rename from assets/css/layouts/message/message_layout.scss
rename to assets/css/layouts/message_layout.scss
diff --git a/assets/css/pages/admins/admins_page.scss b/assets/css/pages/admins_page.scss
similarity index 100%
rename from assets/css/pages/admins/admins_page.scss
rename to assets/css/pages/admins_page.scss
diff --git a/assets/css/pages/instance/instance_installation_page.scss b/assets/css/pages/instance_installation_page.scss
similarity index 100%
rename from assets/css/pages/instance/instance_installation_page.scss
rename to assets/css/pages/instance_installation_page.scss
diff --git a/assets/css/pages/instance/instance_update_page.scss b/assets/css/pages/instance_update_page.scss
similarity index 100%
rename from assets/css/pages/instance/instance_update_page.scss
rename to assets/css/pages/instance_update_page.scss
diff --git a/assets/js/layouts/backend/backend.js b/assets/js/layouts/backend.js
similarity index 100%
rename from assets/js/layouts/backend/backend.js
rename to assets/js/layouts/backend.js
diff --git a/assets/js/pages/admins/backend_admins.js b/assets/js/pages/backend_admins.js
similarity index 100%
rename from assets/js/pages/admins/backend_admins.js
rename to assets/js/pages/backend_admins.js
diff --git a/assets/js/pages/admins/backend_admins_helper.js b/assets/js/pages/backend_admins_helper.js
similarity index 100%
rename from assets/js/pages/admins/backend_admins_helper.js
rename to assets/js/pages/backend_admins_helper.js
diff --git a/assets/js/pages/calendar/backend_calendar.js b/assets/js/pages/backend_calendar.js
similarity index 100%
rename from assets/js/pages/calendar/backend_calendar.js
rename to assets/js/pages/backend_calendar.js
diff --git a/assets/js/pages/calendar/backend_calendar_api.js b/assets/js/pages/backend_calendar_api.js
similarity index 100%
rename from assets/js/pages/calendar/backend_calendar_api.js
rename to assets/js/pages/backend_calendar_api.js
diff --git a/assets/js/pages/calendar/backend_calendar_appointments_modal.js b/assets/js/pages/backend_calendar_appointments_modal.js
similarity index 100%
rename from assets/js/pages/calendar/backend_calendar_appointments_modal.js
rename to assets/js/pages/backend_calendar_appointments_modal.js
diff --git a/assets/js/pages/calendar/backend_calendar_default_view.js b/assets/js/pages/backend_calendar_default_view.js
similarity index 100%
rename from assets/js/pages/calendar/backend_calendar_default_view.js
rename to assets/js/pages/backend_calendar_default_view.js
diff --git a/assets/js/pages/calendar/backend_calendar_google_sync.js b/assets/js/pages/backend_calendar_google_sync.js
similarity index 100%
rename from assets/js/pages/calendar/backend_calendar_google_sync.js
rename to assets/js/pages/backend_calendar_google_sync.js
diff --git a/assets/js/pages/calendar/backend_calendar_table_view.js b/assets/js/pages/backend_calendar_table_view.js
similarity index 100%
rename from assets/js/pages/calendar/backend_calendar_table_view.js
rename to assets/js/pages/backend_calendar_table_view.js
diff --git a/assets/js/pages/calendar/backend_calendar_unavailability_events_modal.js b/assets/js/pages/backend_calendar_unavailability_events_modal.js
similarity index 100%
rename from assets/js/pages/calendar/backend_calendar_unavailability_events_modal.js
rename to assets/js/pages/backend_calendar_unavailability_events_modal.js
diff --git a/assets/js/pages/calendar/backend_calendar_working_plan_exceptions_modal.js b/assets/js/pages/backend_calendar_working_plan_exceptions_modal.js
similarity index 100%
rename from assets/js/pages/calendar/backend_calendar_working_plan_exceptions_modal.js
rename to assets/js/pages/backend_calendar_working_plan_exceptions_modal.js
diff --git a/assets/js/pages/service_categories/backend_categories.js b/assets/js/pages/backend_categories.js
similarity index 100%
rename from assets/js/pages/service_categories/backend_categories.js
rename to assets/js/pages/backend_categories.js
diff --git a/assets/js/pages/service_categories/backend_categories_helper.js b/assets/js/pages/backend_categories_helper.js
similarity index 100%
rename from assets/js/pages/service_categories/backend_categories_helper.js
rename to assets/js/pages/backend_categories_helper.js
diff --git a/assets/js/pages/customers/backend_customers.js b/assets/js/pages/backend_customers.js
similarity index 100%
rename from assets/js/pages/customers/backend_customers.js
rename to assets/js/pages/backend_customers.js
diff --git a/assets/js/pages/customers/backend_customers_helper.js b/assets/js/pages/backend_customers_helper.js
similarity index 100%
rename from assets/js/pages/customers/backend_customers_helper.js
rename to assets/js/pages/backend_customers_helper.js
diff --git a/assets/js/pages/providers/backend_providers.js b/assets/js/pages/backend_providers.js
similarity index 100%
rename from assets/js/pages/providers/backend_providers.js
rename to assets/js/pages/backend_providers.js
diff --git a/assets/js/pages/providers/backend_providers_helper.js b/assets/js/pages/backend_providers_helper.js
similarity index 100%
rename from assets/js/pages/providers/backend_providers_helper.js
rename to assets/js/pages/backend_providers_helper.js
diff --git a/assets/js/pages/secretaries/backend_secretaries.js b/assets/js/pages/backend_secretaries.js
similarity index 100%
rename from assets/js/pages/secretaries/backend_secretaries.js
rename to assets/js/pages/backend_secretaries.js
diff --git a/assets/js/pages/secretaries/backend_secretaries_helper.js b/assets/js/pages/backend_secretaries_helper.js
similarity index 100%
rename from assets/js/pages/secretaries/backend_secretaries_helper.js
rename to assets/js/pages/backend_secretaries_helper.js
diff --git a/assets/js/pages/services/backend_services.js b/assets/js/pages/backend_services.js
similarity index 100%
rename from assets/js/pages/services/backend_services.js
rename to assets/js/pages/backend_services.js
diff --git a/assets/js/pages/services/backend_services_helper.js b/assets/js/pages/backend_services_helper.js
similarity index 100%
rename from assets/js/pages/services/backend_services_helper.js
rename to assets/js/pages/backend_services_helper.js
diff --git a/assets/js/pages/account/forgot_password.js b/assets/js/pages/forgot_password.js
similarity index 100%
rename from assets/js/pages/account/forgot_password.js
rename to assets/js/pages/forgot_password.js
diff --git a/assets/js/pages/booking/frontend_book.js b/assets/js/pages/frontend_book.js
similarity index 100%
rename from assets/js/pages/booking/frontend_book.js
rename to assets/js/pages/frontend_book.js
diff --git a/assets/js/pages/booking/frontend_book_api.js b/assets/js/pages/frontend_book_api.js
similarity index 99%
rename from assets/js/pages/booking/frontend_book_api.js
rename to assets/js/pages/frontend_book_api.js
index 2c1cf044..78e27df9 100755
--- a/assets/js/pages/booking/frontend_book_api.js
+++ b/assets/js/pages/frontend_book_api.js
@@ -207,7 +207,7 @@ window.FrontendBookApi = window.FrontendBookApi || {};
                 }
 
                 window.location.href =
-                    GlobalVariables.baseUrl + '/index.php/appointments/book_success/' + response.appointment_hash;
+                    GlobalVariables.baseUrl + '/index.php/booking/book_success/' + response.appointment_hash;
             })
             .fail(function (jqxhr, textStatus, errorThrown) {
                 $('.captcha-title button').trigger('click');
diff --git a/assets/js/pages/booking/frontend_book_success.js b/assets/js/pages/frontend_book_success.js
similarity index 100%
rename from assets/js/pages/booking/frontend_book_success.js
rename to assets/js/pages/frontend_book_success.js
diff --git a/assets/js/pages/instance/installation.js b/assets/js/pages/installation.js
similarity index 100%
rename from assets/js/pages/instance/installation.js
rename to assets/js/pages/installation.js
diff --git a/assets/js/pages/account/login.js b/assets/js/pages/login.js
similarity index 100%
rename from assets/js/pages/account/login.js
rename to assets/js/pages/login.js