diff --git a/pub/api/v1/devices/files/index.php b/pub/api/v1/autop/devices/files/index.php
similarity index 100%
rename from pub/api/v1/devices/files/index.php
rename to pub/api/v1/autop/devices/files/index.php
diff --git a/pub/api/v1/devices/index.php b/pub/api/v1/autop/devices/index.php
similarity index 100%
rename from pub/api/v1/devices/index.php
rename to pub/api/v1/autop/devices/index.php
diff --git a/pub/api/v1/platforms/index.php b/pub/api/v1/autop/platforms/index.php
similarity index 100%
rename from pub/api/v1/platforms/index.php
rename to pub/api/v1/autop/platforms/index.php
diff --git a/pub/api/v1/vendors/index.php b/pub/api/v1/autop/vendors/index.php
similarity index 100%
rename from pub/api/v1/vendors/index.php
rename to pub/api/v1/autop/vendors/index.php
diff --git a/pub/api/v1/portalsettings/index.php b/pub/api/v1/portal-management/configure/index.php
similarity index 100%
rename from pub/api/v1/portalsettings/index.php
rename to pub/api/v1/portal-management/configure/index.php
diff --git a/pub/api/v1/access-rights/index.php b/pub/api/v1/portal-management/group-permissions/index.php
similarity index 100%
rename from pub/api/v1/access-rights/index.php
rename to pub/api/v1/portal-management/group-permissions/index.php
diff --git a/pub/api/v1/mailsettings/index.php b/pub/api/v1/portal-management/mail/configure/index.php
similarity index 100%
rename from pub/api/v1/mailsettings/index.php
rename to pub/api/v1/portal-management/mail/configure/index.php
diff --git a/pub/api/v1/permissions/index.php b/pub/api/v1/portal-management/permissions/index.php
similarity index 100%
rename from pub/api/v1/permissions/index.php
rename to pub/api/v1/portal-management/permissions/index.php
diff --git a/pub/api/v1/user-groups/index.php b/pub/api/v1/portal-management/user-groups/index.php
similarity index 100%
rename from pub/api/v1/user-groups/index.php
rename to pub/api/v1/portal-management/user-groups/index.php
diff --git a/pub/api/v1/users/index.php b/pub/api/v1/portal-management/users/index.php
similarity index 100%
rename from pub/api/v1/users/index.php
rename to pub/api/v1/portal-management/users/index.php
diff --git a/pub/api/v1/users/apitoken/index.php b/pub/api/v1/user/apitoken/index.php
similarity index 100%
rename from pub/api/v1/users/apitoken/index.php
rename to pub/api/v1/user/apitoken/index.php
diff --git a/pub/api/v1/users/avatar/index.php b/pub/api/v1/user/avatar/index.php
similarity index 100%
rename from pub/api/v1/users/avatar/index.php
rename to pub/api/v1/user/avatar/index.php
diff --git a/pub/api/v1/users/mfa/index.php b/pub/api/v1/user/mfa/index.php
similarity index 100%
rename from pub/api/v1/users/mfa/index.php
rename to pub/api/v1/user/mfa/index.php
diff --git a/pub/api/v1/users/resetpassword/index.php b/pub/api/v1/user/resetpassword/index.php
similarity index 100%
rename from pub/api/v1/users/resetpassword/index.php
rename to pub/api/v1/user/resetpassword/index.php
diff --git a/pub/bin/pages/autop/pageDevices_list.php b/pub/bin/pages/autop/pageDevices_list.php
index 478a45d..87166e8 100644
--- a/pub/bin/pages/autop/pageDevices_list.php
+++ b/pub/bin/pages/autop/pageDevices_list.php
@@ -94,7 +94,7 @@ $pageNavbar->outPutNavbar();
                         <?php } ?>
                         <a href="?view=<?php echo $row['device_uuid'] ?>" class="btn btn-info btn-sm btn-rounded"><i class="far fa-eye"></i></a>
                         <?php if ($API->checkPermissions('admin-devices', 'RW', true)) { ?>
-                            <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $row['device_uuid'] ?>" data-api-url="/api/v1/devices/" data-item-name="device_uuid"><i class="fas fa-trash-alt"></i></a>
+                            <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $row['device_uuid'] ?>" data-api-url="/api/v1/autop/devices/" data-item-name="device_uuid"><i class="fas fa-trash-alt"></i></a>
                         <?php } ?>
                     </td>
                 </tr>
diff --git a/pub/bin/pages/autop/pageDevices_view.php b/pub/bin/pages/autop/pageDevices_view.php
index 9a9a082..54ae8b8 100644
--- a/pub/bin/pages/autop/pageDevices_view.php
+++ b/pub/bin/pages/autop/pageDevices_view.php
@@ -58,10 +58,10 @@ function makeFileTables($API, $dataFolder, $device_slugify)
             </td>
             <td>
                 <?php if ($API->checkPermissions('admin-devices-files', 'RW', true)) { ?>
-                    <form action="/api/v1/devices/files" method="post">
+                    <form action="/api/v1/autop/devices/files" method="post">
                         <input type="hidden" name="filePath" value="">
                         <input type="hidden" name="_method" value="DELETE">
-                        <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $urlPath ?>" data-api-url="/api/v1/devices/files/" data-item-name="file_name"><i class="fas fa-trash-alt"></i></a>
+                        <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $urlPath ?>" data-api-url="/api/v1/autop/devices/files/" data-item-name="file_name"><i class="fas fa-trash-alt"></i></a>
                     </form>
                 <?php } ?>
             </td>
@@ -325,7 +325,7 @@ $pageNavbar->outPutNavbar();
                             </table>
                         </div>
                         <?php if ($API->checkPermissions('admin-devices-files', 'RW', true)) { ?>
-                            <form action="/api/v1/devices/files" class="dropzone p-0" data-form-type="documents">
+                            <form action="/api/v1/autop/devices/files" class="dropzone p-0" data-form-type="documents">
                                 <input type="hidden" name="device_slugify" value="<?php echo $device_data['device_slugify'] ?>">
                                 <input type="hidden" name="filetype" value="documents">
                                 <div class="dz-message mt-1 mb-0" data-dz-message>
@@ -356,7 +356,7 @@ $pageNavbar->outPutNavbar();
                                 </tbody>
                             </table>
                         </div>
-                        <form action="/api/v1/devices/files" class="dropzone p-0" data-form-type="firmware">
+                        <form action="/api/v1/autop/devices/files" class="dropzone p-0" data-form-type="firmware">
                             <input type="hidden" name="device_slugify" value="<?php echo $device_data['device_slugify'] ?>">
                             <input type="hidden" name="filetype" value="firmware">
                             <div class="dz-message mt-1 mb-0" data-dz-message>
diff --git a/pub/bin/pages/autop/pagePlatforms_add.php b/pub/bin/pages/autop/pagePlatforms_add.php
index a4ce7d3..d041308 100644
--- a/pub/bin/pages/autop/pagePlatforms_add.php
+++ b/pub/bin/pages/autop/pagePlatforms_add.php
@@ -41,7 +41,7 @@ array_push($GLOBALS['breadCrumbArray'], array('display' => __('add_platform'), '
 $pageNavbar->outPutNavbar();
 $formBuilder->startForm();
 ?>
-<form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/platforms">
+<form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/autop/platforms">
     <div class="card-body">
         <div class="form-group form-show-validation row">
             <label for="platform_name" class="col-lg-3 col-md-3 col-sm-4 mt-sm-2"><?php echo __('platform_name') ?></label>
diff --git a/pub/bin/pages/autop/pagePlatforms_edit.php b/pub/bin/pages/autop/pagePlatforms_edit.php
index 2d6bdce..b47c187 100644
--- a/pub/bin/pages/autop/pagePlatforms_edit.php
+++ b/pub/bin/pages/autop/pagePlatforms_edit.php
@@ -56,7 +56,7 @@ if ($platform_data) {
     $formBuilder->startForm();
     ?>
 
-    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/platforms">
+    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/autop/platforms/">
         <input type="hidden" name="platform_uuid" value="<?php echo $platform_data["platform_uuid"] ?>">
         <input type="hidden" name="_method" value="PUT">
         <div class="card-body">
diff --git a/pub/bin/pages/autop/pageVendors_add.php b/pub/bin/pages/autop/pageVendors_add.php
index f105d82..6820996 100644
--- a/pub/bin/pages/autop/pageVendors_add.php
+++ b/pub/bin/pages/autop/pageVendors_add.php
@@ -43,7 +43,7 @@ array_push($GLOBALS['breadCrumbArray'], array('display' => __('add_vendor'), 'hr
 $pageNavbar->outPutNavbar();
 $formBuilder->startForm();
 ?>
-    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/vendors">
+    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/autop/vendors/">
         <input type="hidden" name="_return" value="/vendors/">
         <div class="card-body">
             <div class="form-group form-show-validation row">
diff --git a/pub/bin/pages/autop/pageVendors_edit.php b/pub/bin/pages/autop/pageVendors_edit.php
index f9fe139..5c324e7 100644
--- a/pub/bin/pages/autop/pageVendors_edit.php
+++ b/pub/bin/pages/autop/pageVendors_edit.php
@@ -53,7 +53,7 @@ array_push($GLOBALS['breadCrumbArray'], array('display' => __('edit_vendor'), 'h
 $pageNavbar->outPutNavbar();
 $formBuilder->startForm();
 if ($vendor_data) { ?>
-    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/vendors">
+    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/autop/vendors">
         <input type="hidden" name="vendor_uuid" value="<?php echo $vendor_data["vendor_uuid"] ?>">
         <input type="hidden" name="_method" value="PUT">
         <div class="card-body">
diff --git a/pub/bin/pages/pageUserProfile_edit.php b/pub/bin/pages/pageUserProfile_edit.php
index 3074436..18ad1d2 100644
--- a/pub/bin/pages/pageUserProfile_edit.php
+++ b/pub/bin/pages/pageUserProfile_edit.php
@@ -51,7 +51,7 @@ $pageNavbar->outPutNavbar();
 
 if ($user_data) {
     $formBuilder->startForm(); ?>
-    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/users/">
+    <form id="FormValidation" enctype="multipart/form-data" method="POST" action="/api/v1/userprofile/configure/">
         <input type="hidden" name="user_uuid" value="<?php echo $user_uuid; ?>"/>
         <div class="card-body">
 
diff --git a/pub/bin/pages/pageUserProfile_view.php b/pub/bin/pages/pageUserProfile_view.php
index 665026a..9903463 100644
--- a/pub/bin/pages/pageUserProfile_view.php
+++ b/pub/bin/pages/pageUserProfile_view.php
@@ -72,7 +72,7 @@ if ($user_data) { ?>
         <div class="col-md-4 pb-4">
             <div class="card h-100">
                 <div class="card-body">
-                    <form method="POST" action="/api/v1/users/avatar/" enctype="multipart/form-data">
+                    <form method="POST" action="/api/v1/user/avatar/" enctype="multipart/form-data">
                         <input type="hidden" name="user_uuid" value="<?php echo $user_data['user_uuid'] ?>">
                         <h1 class="text-center"><?php echo $user_data['user_full_name'] ?></h1>
                         <div class="form-group form-show-validation row align-items-center justify-content-center">
@@ -209,7 +209,7 @@ if ($user_data) { ?>
                 <div class="card-body">
                     <div id="mfa-enabled-row" class="row" style="display: <?php echo(($_SESSION['user']['user_two_factor_enabled'] == 1) ? '' : 'none') ?>">
                         <div class="col-auto">
-                            <a href="#" class="btn btn-danger delete-btn" data-item-uuid="<?php echo $user_uuid ?>" data-api-url="/api/v1/users/mfa/" data-delete-action='{"mfa-enabled-row":"hide", "mfa-disabled-row":"show"}' data-item-name='user_uuid'>
+                            <a href="#" class="btn btn-danger delete-btn" data-item-uuid="<?php echo $user_uuid ?>" data-api-url="/api/v1/user/mfa/" data-delete-action='{"mfa-enabled-row":"hide", "mfa-disabled-row":"show"}' data-item-name='user_uuid'>
                                 <i class="fa-solid fa-lock"></i> <?php echo __('reset_mfa') ?>
                             </a>
                         </div>
@@ -272,7 +272,7 @@ if ($user_data) { ?>
                     <div class="card-header d-flex justify-content-between align-items-center pt-2 pb-1">
                         <h4 class="mb-0"><?php echo __('api_tokens') ?></h4>
                         <?php if ($API_token->checkPermissions('user-apitoken-self', 'RW', true)) { ?>
-                            <form method="POST" action="/api/v1/users/apitoken/">
+                            <form method="POST" action="/api/v1/user/apitoken/">
                                 <input type="hidden" name="user_uuid" value="<?php echo $user_uuid ?>">
                                 <input type="hidden" name="_return" value="/userprofile/">
                                 <button type="submit" href="#" class="btn btn-primary">
@@ -310,13 +310,13 @@ if ($user_data) { ?>
                                     <td><?php showTime($token_data['api_token_last_used_timestamp']) ?></td>
                                     <td>
                                         <label class="switch">
-                                            <input type="checkbox" class="checkbox" data-api-data='<?php echo json_encode(['api_token_uuid' => $token_data['api_token_uuid'], 'api_token_revoked' => $token_data['api_token_revoked'] ? 1 : 0]) ?>' data-api-changevalue="api_token_revoked" data-api-url="/api/v1/users/apitoken/" <?php echo((($token_data['api_token_revoked'])) ? 'checked' : '') ?>>
+                                            <input type="checkbox" class="checkbox" data-api-data='<?php echo json_encode(['api_token_uuid' => $token_data['api_token_uuid'], 'api_token_revoked' => $token_data['api_token_revoked'] ? 1 : 0]) ?>' data-api-changevalue="api_token_revoked" data-api-url="/api/v1/user/apitoken/" <?php echo((($token_data['api_token_revoked'])) ? 'checked' : '') ?>>
                                             <div class="slider"></div>
                                         </label>
                                     </td>
                                     <?php if ($API_token->checkPermissions('user-apitoken-self', 'RW', true)) { ?>
                                         <td class="text-nowrap">
-                                            <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $token_data['api_token_uuid'] ?>" data-item-name="api_token_uuid" data-api-url="/api/v1/users/apitoken/"><i class="fas fa-trash-alt"></i></a>
+                                            <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $token_data['api_token_uuid'] ?>" data-item-name="api_token_uuid" data-api-url="/api/v1/user/apitoken/"><i class="fas fa-trash-alt"></i></a>
                                         </td>
                                     <?php } ?>
                                 </tr>
diff --git a/pub/bin/pages/portal-management/pageAccessControl_admin_add.php b/pub/bin/pages/portal-management/pageAccessControl_admin_add.php
index 018f06b..a73a90c 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_admin_add.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_admin_add.php
@@ -54,7 +54,7 @@ $pageNavbar->outPutNavbar();
 $formBuilder->startForm();
 ?>
 
-    <form id="FormValidation" enctype="multipart/form-data" method="POST" action="/api/v1/users/">
+    <form id="FormValidation" enctype="multipart/form-data" method="POST" action="/api/v1/portal-management/users/">
         <div class="card-body">
             <div class="col">
                 <p><?php echo __('admin_creation_instruction') ?></p>
diff --git a/pub/bin/pages/portal-management/pageAccessControl_admin_edit.php b/pub/bin/pages/portal-management/pageAccessControl_admin_edit.php
index 9d05b62..8002b25 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_admin_edit.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_admin_edit.php
@@ -59,7 +59,7 @@ array_push($GLOBALS['breadCrumbArray'], array('display' => __('edit_admin'), 'hr
 $pageNavbar->outPutNavbar();
 if ($admin_data) {
     $formBuilder->startForm(); ?>
-    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/users/">
+    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/portal-management/users/">
         <input type="hidden" name="_method" value="PUT">
         <input type="hidden" name="_return" value="/accesscontrol/?admin_view=<?php echo $user_uuid ?>">
         <input type="hidden" name="user_uuid" value="<?php echo $user_uuid; ?>"/>
diff --git a/pub/bin/pages/portal-management/pageAccessControl_admin_view.php b/pub/bin/pages/portal-management/pageAccessControl_admin_view.php
index 89dd081..3e7d612 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_admin_view.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_admin_view.php
@@ -78,7 +78,7 @@ if ($admin_data) { ?>
         <div class="col-md-4 pb-4">
             <div class="card h-100">
                 <div class="card-body">
-                    <form method="POST" action="/api/v1/users/avatar/" enctype="multipart/form-data">
+                    <form method="POST" action="/api/v1/user/avatar/" enctype="multipart/form-data">
                         <input type="hidden" name="user_uuid" value="<?php echo $admin_data['user_uuid'] ?>">
                         <h1 class="text-center"><?php echo $admin_data['user_full_name'] ?></h1>
                         <div class="form-group form-show-validation row align-items-center justify-content-center">
@@ -220,7 +220,7 @@ if ($admin_data) { ?>
                     <?php if ($API->checkPermissions('admin-access-admins-mfa', 'RW', true)) { ?>
                         <div id="mfa-enabled-row" class="row" style="display: <?php echo(($admin_data['user_two_factor_enabled']) ? '' : 'none') ?>">
                             <div class="col-auto">
-                                <a href="#" class="btn btn-danger delete-btn" data-item-uuid="<?php echo $admin_data['user_uuid'] ?>" data-api-url="/api/v1/users/mfa/" data-item-name='user_uuid' data-delete-action='{"mfa-enabled-row":"hide", "mfa-disabled-row":"show"}'>
+                                <a href="#" class="btn btn-danger delete-btn" data-item-uuid="<?php echo $admin_data['user_uuid'] ?>" data-api-url="/api/v1/user/mfa/" data-item-name='user_uuid' data-delete-action='{"mfa-enabled-row":"hide", "mfa-disabled-row":"show"}'>
                                     <i class="fa-solid fa-lock"></i> <?php echo __('reset_mfa') ?>
                                 </a>
                             </div>
@@ -235,7 +235,7 @@ if ($admin_data) { ?>
                         </div>
                     <?php } ?>
                     <?php if ($API->checkPermissions('admin-access-admins-resetpassword', 'RW', true)) { ?>
-                        <form method="post" action="/api/v1/users/resetpassword/">
+                        <form method="post" action="/api/v1/user/resetpassword/">
                             <input type="hidden" name="user_uuid" value="<?php echo $user_uuid ?>">
                             <button class="btn btn-primary mt-2">
                                 <i class="fa-solid fa-lock"></i> <?php echo __('send_password_reset') ?>
@@ -256,7 +256,7 @@ if ($admin_data) { ?>
                     <div class="card-header d-flex justify-content-between align-items-center pt-2 pb-1">
                         <h4 class="mb-0">API Tokens</h4>
                         <?php if ($API_token->checkPermissions('user-apitoken-others', 'RW', true)) { ?>
-                            <form method="POST" action="/api/v1/users/apitoken/">
+                            <form method="POST" action="/api/v1/user/apitoken/">
                                 <input type="hidden" name="user_uuid" value="<?php echo $user_uuid ?>">
                                 <input type="hidden" name="_return" value="/accesscontrol/?admin_view=<?php echo $user_uuid ?>">
                                 <button type="submit" href="#" class="btn btn-primary">
@@ -291,13 +291,13 @@ if ($admin_data) { ?>
                                     <td><?php showTime($token_data['api_token_last_used_timestamp']) ?></td>
                                     <td>
                                         <label class="switch">
-                                            <input type="checkbox" class="checkbox" data-api-data='<?php echo json_encode(['api_token_uuid' => $token_data['api_token_uuid'], 'api_token_revoked' => $token_data['api_token_revoked'] ? 1 : 0]) ?>' data-api-changevalue="api_token_revoked" data-api-url="/api/v1/users/apitoken/" <?php echo((($token_data['api_token_revoked'])) ? 'checked' : '') ?>>
+                                            <input type="checkbox" class="checkbox" data-api-data='<?php echo json_encode(['api_token_uuid' => $token_data['api_token_uuid'], 'api_token_revoked' => $token_data['api_token_revoked'] ? 1 : 0]) ?>' data-api-changevalue="api_token_revoked" data-api-url="/api/v1/user/apitoken/" <?php echo((($token_data['api_token_revoked'])) ? 'checked' : '') ?>>
                                             <div class="slider"></div>
                                         </label>
                                     </td>
                                     <?php if ($API_token->checkPermissions('user-apitoken-others', 'RW', true)) { ?>
                                         <td class="text-nowrap">
-                                            <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $token_data['api_token_uuid'] ?>" data-item-name="api_token_uuid" data-api-url="/api/v1/users/apitoken/"><i class="fas fa-trash-alt"></i></a>
+                                            <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $token_data['api_token_uuid'] ?>" data-item-name="api_token_uuid" data-api-url="/api/v1/user/apitoken/"><i class="fas fa-trash-alt"></i></a>
                                         </td>
                                     <?php } ?>
                                 </tr>
diff --git a/pub/bin/pages/portal-management/pageAccessControl_permission_add.php b/pub/bin/pages/portal-management/pageAccessControl_permission_add.php
index e67c12c..3c8829b 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_permission_add.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_permission_add.php
@@ -48,7 +48,7 @@ array_push($GLOBALS['breadCrumbArray'], array('display' => __('add_permission'),
 $pageNavbar->outPutNavbar();
 $formBuilder->startForm();
 ?>
-    <form id="FormValidation" method="POST" action="/api/v1/permissions/">
+    <form id="FormValidation" method="POST" action="/api/v1/portal-management/permissions/">
         <input type="hidden" name="_return" value="/accesscontrol/#permission">
         <div class="card-body">
 
diff --git a/pub/bin/pages/portal-management/pageAccessControl_permission_edit.php b/pub/bin/pages/portal-management/pageAccessControl_permission_edit.php
index 1c0a09d..d40226a 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_permission_edit.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_permission_edit.php
@@ -59,7 +59,7 @@ $pageNavbar->outPutNavbar();
 
 if ($permission_data) {
     $formBuilder->startForm(); ?>
-    <form id="FormValidation" method="post" action="/api/v1/permissions/">
+    <form id="FormValidation" method="post" action="/api/v1/portal-management/permissions/">
         <input type="hidden" name="_return" value="/accesscontrol/?permission_view=<?php echo $permission_uuid ?>">
         <input type="hidden" name="_method" value="PUT">
         <input type="hidden" name="permission_uuid" value="<?php echo $permission_uuid ?>">
diff --git a/pub/bin/pages/portal-management/pageAccessControl_permission_view.php b/pub/bin/pages/portal-management/pageAccessControl_permission_view.php
index ff9f3b1..e10629c 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_permission_view.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_permission_view.php
@@ -123,21 +123,21 @@ if ($permission_data) { ?>
                             <td><?php echo $permission_data_group['user_group_slugify'] ?> </td>
                             <td>
                                 <label class="switch">
-                                    <input type="checkbox" class="checkbox" data-permission-uuid="<?= $permission_data_group['permission_uuid'] ?>" data-user-group-uuid="<?= $permission_data_group['user_group_uuid'] ?>" data-value="NA" data-api-url="/api/v1/access-rights/" <?php echo(($permission_data_group['permission_value'] == 'NA') ? 'checked' : '') ?>
+                                    <input type="checkbox" class="checkbox" data-permission-uuid="<?= $permission_data_group['permission_uuid'] ?>" data-user-group-uuid="<?= $permission_data_group['user_group_uuid'] ?>" data-value="NA" data-api-url="/api/v1/portal-management/group-permissions/" <?php echo(($permission_data_group['permission_value'] == 'NA') ? 'checked' : '') ?>
                                             <?php echo ($API->checkPermissions('admin-access-control-permissions', 'RW', true)) ? '' : 'disabled' ?>>
                                     <div class="slider"></div>
                                 </label>
                             </td>
                             <td>
                                 <label class="switch">
-                                    <input type="checkbox" class="checkbox" data-permission-uuid="<?= $permission_data_group['permission_uuid'] ?>" data-user-group-uuid="<?= $permission_data_group['user_group_uuid'] ?>" data-value="RO" data-api-url="/api/v1/access-rights/" <?php echo(($permission_data_group['permission_value'] == 'RO') ? 'checked' : '') ?>
+                                    <input type="checkbox" class="checkbox" data-permission-uuid="<?= $permission_data_group['permission_uuid'] ?>" data-user-group-uuid="<?= $permission_data_group['user_group_uuid'] ?>" data-value="RO" data-api-url="/api/v1/portal-management/group-permissions/" <?php echo(($permission_data_group['permission_value'] == 'RO') ? 'checked' : '') ?>
                                             <?php echo ($API->checkPermissions('admin-access-control-permissions', 'RW', true)) ? '' : 'disabled' ?>>
                                     <div class="slider"></div>
                                 </label>
                             </td>
                             <td>
                                 <label class="switch">
-                                    <input type="checkbox" class="checkbox" data-permission-uuid="<?= $permission_data_group['permission_uuid'] ?>" data-user-group-uuid="<?= $permission_data_group['user_group_uuid'] ?>" data-value="RW" data-api-url="/api/v1/access-rights/" <?php echo(($permission_data_group['permission_value'] == 'RW') ? 'checked' : '') ?>
+                                    <input type="checkbox" class="checkbox" data-permission-uuid="<?= $permission_data_group['permission_uuid'] ?>" data-user-group-uuid="<?= $permission_data_group['user_group_uuid'] ?>" data-value="RW" data-api-url="/api/v1/portal-management/group-permissions/" <?php echo(($permission_data_group['permission_value'] == 'RW') ? 'checked' : '') ?>
                                             <?php echo ($API->checkPermissions('admin-access-control-permissions', 'RW', true)) ? '' : 'disabled' ?>>
                                     <div class="slider"></div>
                                 </label>
diff --git a/pub/bin/pages/portal-management/pageAccessControl_user_group_add.php b/pub/bin/pages/portal-management/pageAccessControl_user_group_add.php
index 1368d97..a805300 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_user_group_add.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_user_group_add.php
@@ -48,7 +48,7 @@ array_push($GLOBALS['breadCrumbArray'], array('display' => __('add_user_groups')
 $pageNavbar->outPutNavbar();
 $formBuilder->startForm();
 ?>
-    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/user-groups/">
+    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/portal-management/user-groups/">
         <div class="card-body">
             <div class="form-group form-show-validation row">
                 <label for="user_group_name" class="col-lg-3 col-md-3 col-sm-4 mt-sm-2"><?php echo __('user_group_name') ?></label>
diff --git a/pub/bin/pages/portal-management/pageAccessControl_user_group_edit.php b/pub/bin/pages/portal-management/pageAccessControl_user_group_edit.php
index 35732fe..6659c89 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_user_group_edit.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_user_group_edit.php
@@ -52,7 +52,7 @@ array_push($GLOBALS['breadCrumbArray'], array('display' => __('edit'), 'href' =>
 $pageNavbar->outPutNavbar();
 $formBuilder->startForm();
 ?>
-    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/user-groups/">
+    <form id="FormValidation" enctype="multipart/form-data" method="post" action="/api/v1/portal-management/user-groups/">
         <input type="hidden" name="_method" value="PUT">
         <input type="hidden" name="user_group_uuid" value="<?php echo $user_group['user_group_uuid'] ?>"/>
         <input type="hidden" name="user_group_slugify" value="<?php echo $user_group['user_group_slugify'] ?>"/>
diff --git a/pub/bin/pages/portal-management/pageAccessControl_user_group_view.php b/pub/bin/pages/portal-management/pageAccessControl_user_group_view.php
index 05b58f6..5fd3dd4 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_user_group_view.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_user_group_view.php
@@ -143,21 +143,21 @@ $pageNavbar->outPutNavbar();
                         <td><?php echo $group_permissions_data['permission_name'] ?> </td>
                         <td>
                             <label class="switch">
-                                <input type="checkbox" class="checkbox" data-permission-uuid="<?= $group_permissions_data['permission_uuid'] ?>" data-user-group-uuid="<?= $group_permissions_data['user_group_uuid'] ?>" data-value="NA" data-api-url="/api/v1/access-rights/" <?php echo(($group_permissions_data['permission_value'] == 'NA') ? 'checked' : '') ?>
+                                <input type="checkbox" class="checkbox" data-permission-uuid="<?= $group_permissions_data['permission_uuid'] ?>" data-user-group-uuid="<?= $group_permissions_data['user_group_uuid'] ?>" data-value="NA" data-api-url="/api/v1/portal-management/group-permissions/" <?php echo(($group_permissions_data['permission_value'] == 'NA') ? 'checked' : '') ?>
                                         <?php echo ($toggleDisabled) ? 'disabled' : '' ?>>
                                 <div class="slider"></div>
                             </label>
                         </td>
                         <td>
                             <label class="switch">
-                                <input type="checkbox" class="checkbox" data-permission-uuid="<?= $group_permissions_data['permission_uuid'] ?>" data-user-group-uuid="<?= $group_permissions_data['user_group_uuid'] ?>" data-value="RO" data-api-url="/api/v1/access-rights/" <?php echo(($group_permissions_data['permission_value'] == 'RO') ? 'checked' : '') ?>
+                                <input type="checkbox" class="checkbox" data-permission-uuid="<?= $group_permissions_data['permission_uuid'] ?>" data-user-group-uuid="<?= $group_permissions_data['user_group_uuid'] ?>" data-value="RO" data-api-url="/api/v1/portal-management/group-permissions/" <?php echo(($group_permissions_data['permission_value'] == 'RO') ? 'checked' : '') ?>
                                         <?php echo ($toggleDisabled) ? 'disabled' : '' ?>>
                                 <div class="slider"></div>
                             </label>
                         </td>
                         <td>
                             <label class="switch">
-                                <input type="checkbox" class="checkbox" data-permission-uuid="<?= $group_permissions_data['permission_uuid'] ?>" data-user-group-uuid="<?= $group_permissions_data['user_group_uuid'] ?>" data-value="RW" data-api-url="/api/v1/access-rights/" <?php echo(($group_permissions_data['permission_value'] == 'RW') ? 'checked' : '') ?>
+                                <input type="checkbox" class="checkbox" data-permission-uuid="<?= $group_permissions_data['permission_uuid'] ?>" data-user-group-uuid="<?= $group_permissions_data['user_group_uuid'] ?>" data-value="RW" data-api-url="/api/v1/portal-management/group-permissions/" <?php echo(($group_permissions_data['permission_value'] == 'RW') ? 'checked' : '') ?>
                                         <?php echo ($toggleDisabled) ? 'disabled' : '' ?>>
                                 <div class="slider"></div>
                             </label>
diff --git a/pub/bin/pages/portal-management/pageAccessControl_view.php b/pub/bin/pages/portal-management/pageAccessControl_view.php
index 3444b61..e38088f 100644
--- a/pub/bin/pages/portal-management/pageAccessControl_view.php
+++ b/pub/bin/pages/portal-management/pageAccessControl_view.php
@@ -141,7 +141,7 @@ while ($row = $stmt->fetch_assoc()) {
                                                             <a href="?admin_view=<?php echo $administrator['user_uuid'] ?>" class="btn btn-info btn-sm btn-rounded"><i class="far fa-eye"></i></a>
                                                         <?php } ?>
                                                         <?php if ($API->checkPermissions('admin-access-admins', 'RW', true)) { ?>
-                                                            <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $administrator['user_uuid'] ?>" data-api-url="/api/v1/users/" data-item-name="user_uuid"><i class="fas fa-trash-alt"></i></a>
+                                                            <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $administrator['user_uuid'] ?>" data-api-url="/api/v1/portal-management/users/" data-item-name="user_uuid"><i class="fas fa-trash-alt"></i></a>
                                                         <?php } ?>
                                                     </td>
                                                 </tr>
@@ -207,9 +207,8 @@ while ($row = $stmt->fetch_assoc()) {
 
                                                     <a href="?permission_view=<?php echo $permission['permission_uuid'] ?>" class="btn btn-info btn-sm btn-rounded"><i class="far fa-eye"></i></a>
                                                     <?php if ($API->isSuperuser()) { ?>
-                                                        <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $permission['permission_uuid'] ?>" data-item-name="permission_uuid" data-api-url="/api/v1/permissions/"><i class="fas fa-trash-alt"></i></a>
+                                                        <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $permission['permission_uuid'] ?>" data-item-name="permission_uuid" data-api-url="/api/v1/portal-management/permissions/"><i class="fas fa-trash-alt"></i></a>
                                                     <?php } ?>
-
                                                 </td>
                                             </tr>
                                         <?php } ?>
@@ -270,7 +269,7 @@ while ($row = $stmt->fetch_assoc()) {
                                                         <a href="?user_group_view=<?php echo $user_group['user_group_uuid'] ?>" class="btn btn-info btn-sm btn-rounded"><i class="far fa-eye"></i></a>
                                                     <?php } ?>
                                                     <?php if ($API->checkPermissions('admin-access-control-user-groups', 'RW', true)) { ?>
-                                                        <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $user_group['user_group_uuid'] ?>" data-api-url="/api/v1/user-groups/" data-item-name="user_group_uuid"><i class="fas fa-trash-alt"></i></a>
+                                                        <a href="#" class="btn btn-danger btn-sm btn-rounded delete-btn" data-item-uuid="<?php echo $user_group['user_group_uuid'] ?>" data-api-url="/api/v1/portal-management/user-groups/" data-item-name="user_group_uuid"><i class="fas fa-trash-alt"></i></a>
                                                     <?php } ?>
                                                 </td>
                                             </tr>
diff --git a/pub/bin/pages/portal-management/pageSystemConfig.php b/pub/bin/pages/portal-management/pageSystemConfig.php
index d8b28f1..56145c7 100644
--- a/pub/bin/pages/portal-management/pageSystemConfig.php
+++ b/pub/bin/pages/portal-management/pageSystemConfig.php
@@ -85,7 +85,7 @@ while ($module = $system_modules_data->fetch_assoc()) {
                             </div>
                         </div>
                         <div class="card">
-                            <form id="FormValidation" method="post" action="/api/v1/portalsettings/">
+                            <form id="FormValidation" method="post" action="/api/v1/portal-management/configure/">
                                 <input type="hidden" name="_method" value="PUT">
                                 <input type="hidden" name="_return" value="/systemconfig/#global-settings">
                                 <input type="hidden" name="portal_uuid" value="<?php echo $portal_settings['portal_uuid']; ?>">
@@ -173,7 +173,7 @@ while ($module = $system_modules_data->fetch_assoc()) {
                             </div>
                         </div>
                         <div class="card">
-                            <form id="FormValidation" method="post" action="/api/v1/mailsettings/">
+                            <form id="FormValidation" method="post" action="/api/v1/portal-management/mail/configure/">
                                 <input type="hidden" name="portal_uuid" value="<?php echo $portal_settings['portal_uuid']; ?>">
                                 <input type="hidden" name="_method" value="PUT">
                                 <input type="hidden" name="_return" value="/systemconfig/#mail-settings">
diff --git a/pub/login/mfaSetup.php b/pub/login/mfaSetup.php
index 9453175..5102fae 100644
--- a/pub/login/mfaSetup.php
+++ b/pub/login/mfaSetup.php
@@ -97,7 +97,7 @@ $_SESSION['mfasetup']['secret'] = $secret;
                         </div>
                     </div>
                     <div class="card col-md-6 mb-0">
-                        <form method="post" action="/api/v1/users/mfa/">
+                        <form method="post" action="/api/v1/user/mfa/">
                             <input type="hidden" name="_return" value="/userprofile/">
                             <div class="card-body text-center">
                                 <h2>Step 2.</h2>