diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
index 19d2a49372..c5f538ed2d 100644
--- a/libraries/classes/Server/Privileges.php
+++ b/libraries/classes/Server/Privileges.php
@@ -492,7 +492,7 @@ class Privileges
         $name_for_dfn,
         $name_for_current
     ) {
-        return $this->template->render('privileges/column_privileges', [
+        return $this->template->render('server/privileges/column_privileges', [
             'columns' => $columns,
             'row' => $row,
             'name_for_select' => $name_for_select,
@@ -573,7 +573,7 @@ class Privileges
         }
         $GLOBALS['dbi']->freeResult($result);
 
-        return $this->template->render('privileges/choose_user_group', [
+        return $this->template->render('server/privileges/choose_user_group', [
             'all_user_groups' => $allUserGroups,
             'user_group' => $userGroup,
             'params' => ['username' => $username]
@@ -845,7 +845,7 @@ class Privileges
             ],
         ];
 
-        return $this->template->render('privileges/require_options', [
+        return $this->template->render('server/privileges/require_options', [
             'require_options' => $require_options
         ]);
     }
@@ -897,7 +897,7 @@ class Privileges
             ]
         ];
 
-        $html_output = $this->template->render('privileges/resource_limits', [
+        $html_output = $this->template->render('server/privileges/resource_limits', [
             'limits' => $limits
         ]);
 
@@ -953,7 +953,7 @@ class Privileges
             $privs
         );
 
-        return $this->template->render('privileges/edit_routine_privileges', [
+        return $this->template->render('server/privileges/edit_routine_privileges', [
             'username' => $username,
             'hostname' => $hostname,
             'database' => $db,
@@ -1455,7 +1455,7 @@ class Privileges
         array $privTableNames,
         array $row
     ) {
-        return $this->template->render('privileges/global_priv_table', [
+        return $this->template->render('server/privileges/global_priv_table', [
             'priv_table' => $privTable,
             'priv_table_names' => $privTableNames,
             'row' => $row,
@@ -3581,7 +3581,7 @@ class Privileges
             $data['routines'] = $routines;
         }
 
-        return $this->template->render('privileges/privileges_summary', $data);
+        return $this->template->render('server/privileges/privileges_summary', $data);
     }
 
     /**
@@ -3812,7 +3812,7 @@ class Privileges
     {
         $html_output = $this->getAddUserHtmlFieldset();
 
-        $html_output .= $this->template->render('privileges/delete_user_fieldset');
+        $html_output .= $this->template->render('server/privileges/delete_user_fieldset');
 
         return $html_output;
     }
@@ -3851,7 +3851,7 @@ class Privileges
 
         uksort($array_initials, "strnatcasecmp");
 
-        return $this->template->render('privileges/initials_row', [
+        return $this->template->render('server/privileges/initials_row', [
             'array_initials' => $array_initials,
             'initial' => isset($_REQUEST['initial']) ? $_REQUEST['initial'] : null,
         ]);
@@ -4572,7 +4572,7 @@ class Privileges
                     = $table;
         }
 
-        return $this->template->render('privileges/add_user_fieldset', [
+        return $this->template->render('server/privileges/add_user_fieldset', [
             'url_params' => $url_params,
             'rel_params' => $rel_params
         ]);
diff --git a/templates/privileges/add_privileges_database.twig b/templates/server/privileges/add_privileges_database.twig
similarity index 100%
rename from templates/privileges/add_privileges_database.twig
rename to templates/server/privileges/add_privileges_database.twig
diff --git a/templates/privileges/add_privileges_routine.twig b/templates/server/privileges/add_privileges_routine.twig
similarity index 100%
rename from templates/privileges/add_privileges_routine.twig
rename to templates/server/privileges/add_privileges_routine.twig
diff --git a/templates/privileges/add_privileges_table.twig b/templates/server/privileges/add_privileges_table.twig
similarity index 100%
rename from templates/privileges/add_privileges_table.twig
rename to templates/server/privileges/add_privileges_table.twig
diff --git a/templates/privileges/add_user_fieldset.twig b/templates/server/privileges/add_user_fieldset.twig
similarity index 100%
rename from templates/privileges/add_user_fieldset.twig
rename to templates/server/privileges/add_user_fieldset.twig
diff --git a/templates/privileges/choose_user_group.twig b/templates/server/privileges/choose_user_group.twig
similarity index 100%
rename from templates/privileges/choose_user_group.twig
rename to templates/server/privileges/choose_user_group.twig
diff --git a/templates/privileges/column_privileges.twig b/templates/server/privileges/column_privileges.twig
similarity index 100%
rename from templates/privileges/column_privileges.twig
rename to templates/server/privileges/column_privileges.twig
diff --git a/templates/privileges/delete_user_fieldset.twig b/templates/server/privileges/delete_user_fieldset.twig
similarity index 100%
rename from templates/privileges/delete_user_fieldset.twig
rename to templates/server/privileges/delete_user_fieldset.twig
diff --git a/templates/privileges/edit_routine_privileges.twig b/templates/server/privileges/edit_routine_privileges.twig
similarity index 100%
rename from templates/privileges/edit_routine_privileges.twig
rename to templates/server/privileges/edit_routine_privileges.twig
diff --git a/templates/privileges/global_priv_table.twig b/templates/server/privileges/global_priv_table.twig
similarity index 91%
rename from templates/privileges/global_priv_table.twig
rename to templates/server/privileges/global_priv_table.twig
index 8a6d115582..79b2a4d99b 100644
--- a/templates/privileges/global_priv_table.twig
+++ b/templates/server/privileges/global_priv_table.twig
@@ -8,7 +8,7 @@
         {% for priv in table %}
             {% set checked = row[priv[0] ~ '_priv'] is defined and row[priv[0] ~ '_priv'] == 'Y' ? ' checked="checked"' %}
             {% set formatted_priv = ServerPrivileges_formatPrivilege(priv, true) %}
-            {% include 'privileges/global_priv_tbl_item.twig' with {
+            {% include 'server/privileges/global_priv_tbl_item.twig' with {
                 'checked': checked,
                 'formatted_priv': formatted_priv,
                 'priv': priv
diff --git a/templates/privileges/global_priv_tbl_item.twig b/templates/server/privileges/global_priv_tbl_item.twig
similarity index 100%
rename from templates/privileges/global_priv_tbl_item.twig
rename to templates/server/privileges/global_priv_tbl_item.twig
diff --git a/templates/privileges/initials_row.twig b/templates/server/privileges/initials_row.twig
similarity index 100%
rename from templates/privileges/initials_row.twig
rename to templates/server/privileges/initials_row.twig
diff --git a/templates/privileges/privileges_summary.twig b/templates/server/privileges/privileges_summary.twig
similarity index 86%
rename from templates/privileges/privileges_summary.twig
rename to templates/server/privileges/privileges_summary.twig
index 31f2173d41..c96399505f 100644
--- a/templates/privileges/privileges_summary.twig
+++ b/templates/server/privileges/privileges_summary.twig
@@ -31,7 +31,7 @@
                     </tr>
                 {% else %}
                     {% for privilege in privileges %}
-                        {% include 'privileges/privileges_summary_row.twig' with
+                        {% include 'server/privileges/privileges_summary_row.twig' with
                             privilege|merge({'type': type})
                         only %}
                     {% endfor %}
@@ -40,16 +40,16 @@
         </table>
 
         {% if type == 'database' %}
-            {% include 'privileges/add_privileges_database.twig' with {
+            {% include 'server/privileges/add_privileges_database.twig' with {
                 'databases': databases
             } only %}
         {% elseif type == 'table' %}
-            {% include 'privileges/add_privileges_table.twig' with {
+            {% include 'server/privileges/add_privileges_table.twig' with {
                 'database': database,
                 'tables': tables
             } only %}
         {% else %}
-            {% include 'privileges/add_privileges_routine.twig' with {
+            {% include 'server/privileges/add_privileges_routine.twig' with {
                 'database': database,
                 'routines': routines
             } only %}
diff --git a/templates/privileges/privileges_summary_row.twig b/templates/server/privileges/privileges_summary_row.twig
similarity index 100%
rename from templates/privileges/privileges_summary_row.twig
rename to templates/server/privileges/privileges_summary_row.twig
diff --git a/templates/privileges/require_options.twig b/templates/server/privileges/require_options.twig
similarity index 85%
rename from templates/privileges/require_options.twig
rename to templates/server/privileges/require_options.twig
index 157f27230d..e16515cfb5 100644
--- a/templates/privileges/require_options.twig
+++ b/templates/server/privileges/require_options.twig
@@ -5,7 +5,7 @@
             {% if require_option['name'] is same as('ssl_cipher') %}
                 <div id="specified_div" style="padding-left:20px;">
             {% endif %}
-            {% include 'privileges/require_options_item.twig' with {
+            {% include 'server/privileges/require_options_item.twig' with {
                 'require_option': require_option
             } only %}
         {% endfor %}
diff --git a/templates/privileges/require_options_item.twig b/templates/server/privileges/require_options_item.twig
similarity index 100%
rename from templates/privileges/require_options_item.twig
rename to templates/server/privileges/require_options_item.twig
diff --git a/templates/privileges/resource_limit_item.twig b/templates/server/privileges/resource_limit_item.twig
similarity index 100%
rename from templates/privileges/resource_limit_item.twig
rename to templates/server/privileges/resource_limit_item.twig
diff --git a/templates/privileges/resource_limits.twig b/templates/server/privileges/resource_limits.twig
similarity index 81%
rename from templates/privileges/resource_limits.twig
rename to templates/server/privileges/resource_limits.twig
index 8d61ac5927..f04a61d4b9 100644
--- a/templates/privileges/resource_limits.twig
+++ b/templates/server/privileges/resource_limits.twig
@@ -6,7 +6,7 @@
         </small>
     </p>
     {% for limit in limits %}
-        {% include 'privileges/resource_limit_item.twig' with {
+        {% include 'server/privileges/resource_limit_item.twig' with {
             'limit': limit
         } only %}
     {% endfor %}