diff --git a/src/Controller/AdminPages/AttachmentTypeController.php b/src/Controller/AdminPages/AttachmentTypeController.php
index b1f59706..6ff5d930 100644
--- a/src/Controller/AdminPages/AttachmentTypeController.php
+++ b/src/Controller/AdminPages/AttachmentTypeController.php
@@ -42,7 +42,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class AttachmentTypeController extends BaseAdminController
 {
     protected string $entity_class = AttachmentType::class;
-    protected string $twig_template = 'AdminPages/AttachmentTypeAdmin.html.twig';
+    protected string $twig_template = 'admin/attachment_type_admin.html.twig';
     protected string $form_class = AttachmentTypeAdminForm::class;
     protected string $route_base = 'attachment_type';
     protected string $attachment_class = AttachmentTypeAttachment::class;
diff --git a/src/Controller/AdminPages/CategoryController.php b/src/Controller/AdminPages/CategoryController.php
index 4e170892..4f247a1d 100644
--- a/src/Controller/AdminPages/CategoryController.php
+++ b/src/Controller/AdminPages/CategoryController.php
@@ -41,7 +41,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class CategoryController extends BaseAdminController
 {
     protected string $entity_class = Category::class;
-    protected string $twig_template = 'AdminPages/CategoryAdmin.html.twig';
+    protected string $twig_template = 'admin/category_admin.html.twig';
     protected string $form_class = CategoryAdminForm::class;
     protected string $route_base = 'category';
     protected string $attachment_class = CategoryAttachment::class;
diff --git a/src/Controller/AdminPages/CurrencyController.php b/src/Controller/AdminPages/CurrencyController.php
index 89174874..133c3a50 100644
--- a/src/Controller/AdminPages/CurrencyController.php
+++ b/src/Controller/AdminPages/CurrencyController.php
@@ -59,7 +59,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class CurrencyController extends BaseAdminController
 {
     protected string $entity_class = Currency::class;
-    protected string $twig_template = 'AdminPages/CurrencyAdmin.html.twig';
+    protected string $twig_template = 'admin/currency_admin.html.twig';
     protected string $form_class = CurrencyAdminForm::class;
     protected string $route_base = 'currency';
     protected string $attachment_class = CurrencyAttachment::class;
diff --git a/src/Controller/AdminPages/FootprintController.php b/src/Controller/AdminPages/FootprintController.php
index 9496b157..ba37256c 100644
--- a/src/Controller/AdminPages/FootprintController.php
+++ b/src/Controller/AdminPages/FootprintController.php
@@ -42,7 +42,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class FootprintController extends BaseAdminController
 {
     protected string $entity_class = Footprint::class;
-    protected string $twig_template = 'AdminPages/FootprintAdmin.html.twig';
+    protected string $twig_template = 'admin/footprint_admin.html.twig';
     protected string $form_class = FootprintAdminForm::class;
     protected string $route_base = 'footprint';
     protected string $attachment_class = FootprintAttachment::class;
diff --git a/src/Controller/AdminPages/LabelProfileController.php b/src/Controller/AdminPages/LabelProfileController.php
index 46ee11ce..96b70009 100644
--- a/src/Controller/AdminPages/LabelProfileController.php
+++ b/src/Controller/AdminPages/LabelProfileController.php
@@ -41,7 +41,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class LabelProfileController extends BaseAdminController
 {
     protected string $entity_class = LabelProfile::class;
-    protected string $twig_template = 'AdminPages/LabelProfileAdmin.html.twig';
+    protected string $twig_template = 'admin/label_profile_admin.html.twig';
     protected string $form_class = LabelProfileAdminForm::class;
     protected string $route_base = 'label_profile';
     protected string $attachment_class = LabelAttachment::class;
diff --git a/src/Controller/AdminPages/ManufacturerController.php b/src/Controller/AdminPages/ManufacturerController.php
index bd9d2c11..2ded7d10 100644
--- a/src/Controller/AdminPages/ManufacturerController.php
+++ b/src/Controller/AdminPages/ManufacturerController.php
@@ -41,7 +41,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class ManufacturerController extends BaseAdminController
 {
     protected string $entity_class = Manufacturer::class;
-    protected string $twig_template = 'AdminPages/ManufacturerAdmin.html.twig';
+    protected string $twig_template = 'admin/manufacturer_admin.html.twig';
     protected string $form_class = CompanyForm::class;
     protected string $route_base = 'manufacturer';
     protected string $attachment_class = ManufacturerAttachment::class;
diff --git a/src/Controller/AdminPages/MeasurementUnitController.php b/src/Controller/AdminPages/MeasurementUnitController.php
index 9b233a1c..402c2018 100644
--- a/src/Controller/AdminPages/MeasurementUnitController.php
+++ b/src/Controller/AdminPages/MeasurementUnitController.php
@@ -42,7 +42,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class MeasurementUnitController extends BaseAdminController
 {
     protected string $entity_class = MeasurementUnit::class;
-    protected string $twig_template = 'AdminPages/MeasurementUnitAdmin.html.twig';
+    protected string $twig_template = 'admin/measurement_unit_admin.html.twig';
     protected string $form_class = MeasurementUnitAdminForm::class;
     protected string $route_base = 'measurement_unit';
     protected string $attachment_class = MeasurementUnitAttachment::class;
diff --git a/src/Controller/AdminPages/ProjectAdminController.php b/src/Controller/AdminPages/ProjectAdminController.php
index a97f58c8..ae14ea27 100644
--- a/src/Controller/AdminPages/ProjectAdminController.php
+++ b/src/Controller/AdminPages/ProjectAdminController.php
@@ -42,7 +42,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class ProjectAdminController extends BaseAdminController
 {
     protected string $entity_class = Project::class;
-    protected string $twig_template = 'AdminPages/ProjectAdmin.html.twig';
+    protected string $twig_template = 'admin/project_admin.html.twig';
     protected string $form_class = ProjectAdminForm::class;
     protected string $route_base = 'project';
     protected string $attachment_class = ProjectAttachment::class;
diff --git a/src/Controller/AdminPages/StorelocationController.php b/src/Controller/AdminPages/StorelocationController.php
index a38d4ce3..080690ab 100644
--- a/src/Controller/AdminPages/StorelocationController.php
+++ b/src/Controller/AdminPages/StorelocationController.php
@@ -41,7 +41,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class StorelocationController extends BaseAdminController
 {
     protected string $entity_class = Storelocation::class;
-    protected string $twig_template = 'AdminPages/StorelocationAdmin.html.twig';
+    protected string $twig_template = 'admin/storelocation_admin.html.twig';
     protected string $form_class = StorelocationAdminForm::class;
     protected string $route_base = 'store_location';
     protected string $attachment_class = StorelocationAttachment::class;
diff --git a/src/Controller/AdminPages/SupplierController.php b/src/Controller/AdminPages/SupplierController.php
index 1939bd53..f7505c6a 100644
--- a/src/Controller/AdminPages/SupplierController.php
+++ b/src/Controller/AdminPages/SupplierController.php
@@ -41,7 +41,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class SupplierController extends BaseAdminController
 {
     protected string $entity_class = Supplier::class;
-    protected string $twig_template = 'AdminPages/SupplierAdmin.html.twig';
+    protected string $twig_template = 'admin/supplier_admin.html.twig';
     protected string $form_class = SupplierForm::class;
     protected string $route_base = 'supplier';
     protected string $attachment_class = SupplierAttachment::class;
diff --git a/src/Controller/GroupController.php b/src/Controller/GroupController.php
index ee21fb6a..1eb10d76 100644
--- a/src/Controller/GroupController.php
+++ b/src/Controller/GroupController.php
@@ -45,7 +45,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class GroupController extends BaseAdminController
 {
     protected string $entity_class = Group::class;
-    protected string $twig_template = 'AdminPages/GroupAdmin.html.twig';
+    protected string $twig_template = 'admin/group_admin.html.twig';
     protected string $form_class = GroupAdminForm::class;
     protected string $route_base = 'group';
     protected string $attachment_class = GroupAttachment::class;
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 9cba8ec5..6dad4159 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -54,7 +54,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class UserController extends AdminPages\BaseAdminController
 {
     protected string $entity_class = User::class;
-    protected string $twig_template = 'AdminPages/UserAdmin.html.twig';
+    protected string $twig_template = 'admin/user_admin.html.twig';
     protected string $form_class = UserAdminForm::class;
     protected string $route_base = 'user';
     protected string $attachment_class = UserAttachment::class;
diff --git a/templates/AdminPages/_attachments.html.twig b/templates/admin/_attachments.html.twig
similarity index 100%
rename from templates/AdminPages/_attachments.html.twig
rename to templates/admin/_attachments.html.twig
diff --git a/templates/AdminPages/_delete_form.html.twig b/templates/admin/_delete_form.html.twig
similarity index 100%
rename from templates/AdminPages/_delete_form.html.twig
rename to templates/admin/_delete_form.html.twig
diff --git a/templates/AdminPages/_duplicate.html.twig b/templates/admin/_duplicate.html.twig
similarity index 100%
rename from templates/AdminPages/_duplicate.html.twig
rename to templates/admin/_duplicate.html.twig
diff --git a/templates/AdminPages/_export_form.html.twig b/templates/admin/_export_form.html.twig
similarity index 100%
rename from templates/AdminPages/_export_form.html.twig
rename to templates/admin/_export_form.html.twig
diff --git a/templates/AdminPages/_info.html.twig b/templates/admin/_info.html.twig
similarity index 100%
rename from templates/AdminPages/_info.html.twig
rename to templates/admin/_info.html.twig
diff --git a/templates/AdminPages/_parameters.html.twig b/templates/admin/_parameters.html.twig
similarity index 100%
rename from templates/AdminPages/_parameters.html.twig
rename to templates/admin/_parameters.html.twig
diff --git a/templates/AdminPages/AttachmentTypeAdmin.html.twig b/templates/admin/attachment_type_admin.html.twig
similarity index 88%
rename from templates/AdminPages/AttachmentTypeAdmin.html.twig
rename to templates/admin/attachment_type_admin.html.twig
index 91180a7c..89a47ae5 100644
--- a/templates/AdminPages/AttachmentTypeAdmin.html.twig
+++ b/templates/admin/attachment_type_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {% block card_title %}
     <i class="fas fa-file-alt fa-fw"></i> {% trans %}attachment_type.caption{% endtrans %}
diff --git a/templates/AdminPages/EntityAdminBase.html.twig b/templates/admin/base_admin.html.twig
similarity index 93%
rename from templates/AdminPages/EntityAdminBase.html.twig
rename to templates/admin/base_admin.html.twig
index 9e8d4de4..cdb1adf8 100644
--- a/templates/AdminPages/EntityAdminBase.html.twig
+++ b/templates/admin/base_admin.html.twig
@@ -106,7 +106,7 @@
                                     {% block additional_panes %}{% endblock %}
 
                                     <div class="tab-pane" id="attachments">
-                                        {% include "AdminPages/_attachments.html.twig" %}
+                                        {% include "admin/_attachments.html.twig" %}
                                         {% block master_picture_block %}
                                             {{ form_row(form.master_picture_attachment) }}
                                         {% endblock %}
@@ -114,7 +114,7 @@
 
                                     {% if entity.parameters is defined %}
                                         <div id="parameters" class="tab-pane fade">
-                                            {% include "AdminPages/_parameters.html.twig" %}
+                                            {% include "admin/_parameters.html.twig" %}
                                         </div>
                                     {% endif %}
                                 </div>
@@ -140,14 +140,14 @@
 
                                 {# Only include on existing parts #}
                                 {% if entity.id %}
-                                    {{ include('AdminPages/_duplicate.html.twig') }}
-                                    {{ include('AdminPages/_delete_form.html.twig') }}
+                                    {{ include('admin/_duplicate.html.twig') }}
+                                    {{ include('admin/_delete_form.html.twig') }}
                                 {% endif %}
 
                             </div>
 
                             <div id="info" class="tab-pane fade">
-                                {% include "AdminPages/_info.html.twig" %}
+                                {% include "admin/_info.html.twig" %}
                             </div>
 
                             {% if datatable is defined and datatable is not null %}
@@ -159,7 +159,7 @@
 
                             {% if entity.id %}
                                 <div id="export" class="tab-pane fade">
-                                    {% include 'AdminPages/_export_form.html.twig' with {'path' : path(route_base ~ '_export', {'id': entity.id})} %}
+                                    {% include 'admin/_export_form.html.twig' with {'path' : path(route_base ~ '_export', {'id': entity.id})} %}
                                 </div>
                             {% else %} {# For new element we have a combined import/export tab #}
                                 <div id="import_export" class="tab-pane fade">
@@ -171,7 +171,7 @@
                                     <hr>
                                     <fieldset>
                                         <legend>{% trans %}export_all.label{% endtrans %}</legend>
-                                        {% include 'AdminPages/_export_form.html.twig' with {'path' : path('attachment_type_export_all')} %}
+                                        {% include 'admin/_export_form.html.twig' with {'path' : path('attachment_type_export_all')} %}
                                     </fieldset>
                                 </div>
 
diff --git a/templates/AdminPages/CompanyAdminBase.html.twig b/templates/admin/base_company_admin.html.twig
similarity index 93%
rename from templates/AdminPages/CompanyAdminBase.html.twig
rename to templates/admin/base_company_admin.html.twig
index db913ff1..5b5a72c5 100644
--- a/templates/AdminPages/CompanyAdminBase.html.twig
+++ b/templates/admin/base_company_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {% block additional_controls %}
     {{ form_row(form.address) }}
diff --git a/templates/AdminPages/CategoryAdmin.html.twig b/templates/admin/category_admin.html.twig
similarity index 95%
rename from templates/AdminPages/CategoryAdmin.html.twig
rename to templates/admin/category_admin.html.twig
index 64cf7c6a..c1542206 100644
--- a/templates/AdminPages/CategoryAdmin.html.twig
+++ b/templates/admin/category_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {% block card_title %}
     <i class="fas fa-tags fa-fw"></i> {% trans %}category.labelp{% endtrans %}
diff --git a/templates/AdminPages/CurrencyAdmin.html.twig b/templates/admin/currency_admin.html.twig
similarity index 96%
rename from templates/AdminPages/CurrencyAdmin.html.twig
rename to templates/admin/currency_admin.html.twig
index f163deea..dca46ce6 100644
--- a/templates/AdminPages/CurrencyAdmin.html.twig
+++ b/templates/admin/currency_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {% block card_title %}
     <i class="fa-solid fa-coins"></i> {% trans %}currency.caption{% endtrans %}
diff --git a/templates/AdminPages/FootprintAdmin.html.twig b/templates/admin/footprint_admin.html.twig
similarity index 90%
rename from templates/AdminPages/FootprintAdmin.html.twig
rename to templates/admin/footprint_admin.html.twig
index 2771fa46..04acaa39 100644
--- a/templates/AdminPages/FootprintAdmin.html.twig
+++ b/templates/admin/footprint_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {% block card_title %}
     <i class="fas fa-microchip fa-fw"></i> {% trans %}footprint.labelp{% endtrans %}
diff --git a/templates/AdminPages/GroupAdmin.html.twig b/templates/admin/group_admin.html.twig
similarity index 93%
rename from templates/AdminPages/GroupAdmin.html.twig
rename to templates/admin/group_admin.html.twig
index de88aab3..91975524 100644
--- a/templates/AdminPages/GroupAdmin.html.twig
+++ b/templates/admin/group_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {% block card_title %}
     <i class="fas fa-users fa-fw"></i> {% trans %}group.edit.caption{% endtrans %}
diff --git a/templates/AdminPages/LabelProfileAdmin.html.twig b/templates/admin/label_profile_admin.html.twig
similarity index 97%
rename from templates/AdminPages/LabelProfileAdmin.html.twig
rename to templates/admin/label_profile_admin.html.twig
index 3fd56445..10c2320f 100644
--- a/templates/AdminPages/LabelProfileAdmin.html.twig
+++ b/templates/admin/label_profile_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {% block card_title %}
     <i class="fas fa-qrcode fa-fw"></i> {% trans %}label_profile.caption{% endtrans %}
diff --git a/templates/AdminPages/ManufacturerAdmin.html.twig b/templates/admin/manufacturer_admin.html.twig
similarity index 87%
rename from templates/AdminPages/ManufacturerAdmin.html.twig
rename to templates/admin/manufacturer_admin.html.twig
index 793f36b1..5db892c0 100644
--- a/templates/AdminPages/ManufacturerAdmin.html.twig
+++ b/templates/admin/manufacturer_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/CompanyAdminBase.html.twig" %}
+{% extends "admin/base_company_admin.html.twig" %}
 
 {% block card_title %}
     <i class="fas fa-industry fa-fw"></i> {% trans %}manufacturer.caption{% endtrans %}
diff --git a/templates/AdminPages/MeasurementUnitAdmin.html.twig b/templates/admin/measurement_unit_admin.html.twig
similarity index 84%
rename from templates/AdminPages/MeasurementUnitAdmin.html.twig
rename to templates/admin/measurement_unit_admin.html.twig
index 0e87b77e..b2e7da40 100644
--- a/templates/AdminPages/MeasurementUnitAdmin.html.twig
+++ b/templates/admin/measurement_unit_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {% block card_title %}
     <i class="fas fa-balance-scale fa-fw"></i> {% trans %}measurement_unit.caption{% endtrans %}
diff --git a/templates/AdminPages/ProjectAdmin.html.twig b/templates/admin/project_admin.html.twig
similarity index 97%
rename from templates/AdminPages/ProjectAdmin.html.twig
rename to templates/admin/project_admin.html.twig
index 8a2dfbc1..071340bf 100644
--- a/templates/AdminPages/ProjectAdmin.html.twig
+++ b/templates/admin/project_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {# @var entity App\Entity\ProjectSystem\Project #}
 
diff --git a/templates/AdminPages/StorelocationAdmin.html.twig b/templates/admin/storelocation_admin.html.twig
similarity index 95%
rename from templates/AdminPages/StorelocationAdmin.html.twig
rename to templates/admin/storelocation_admin.html.twig
index e7d65753..5932b715 100644
--- a/templates/AdminPages/StorelocationAdmin.html.twig
+++ b/templates/admin/storelocation_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 {% import "label_system/dropdown_macro.html.twig" as dropdown %}
 
 {% block card_title %}
diff --git a/templates/AdminPages/SupplierAdmin.html.twig b/templates/admin/supplier_admin.html.twig
similarity index 91%
rename from templates/AdminPages/SupplierAdmin.html.twig
rename to templates/admin/supplier_admin.html.twig
index 5cbe59ba..9c0fcb47 100644
--- a/templates/AdminPages/SupplierAdmin.html.twig
+++ b/templates/admin/supplier_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/CompanyAdminBase.html.twig" %}
+{% extends "admin/base_company_admin.html.twig" %}
 
 {% block card_title %}
     <i class="fas fa-truck fa-fw"></i> {% trans %}supplier.caption{% endtrans %}
diff --git a/templates/AdminPages/UserAdmin.html.twig b/templates/admin/user_admin.html.twig
similarity index 98%
rename from templates/AdminPages/UserAdmin.html.twig
rename to templates/admin/user_admin.html.twig
index 98ee4cde..69003339 100644
--- a/templates/AdminPages/UserAdmin.html.twig
+++ b/templates/admin/user_admin.html.twig
@@ -1,4 +1,4 @@
-{% extends "AdminPages/EntityAdminBase.html.twig" %}
+{% extends "admin/base_admin.html.twig" %}
 
 {% import "helper.twig" as helper %}