diff --git a/blueprints/pages/modular_new.yaml b/blueprints/admin/pages/modular_new.yaml
similarity index 100%
rename from blueprints/pages/modular_new.yaml
rename to blueprints/admin/pages/modular_new.yaml
diff --git a/blueprints/pages/modular_raw.yaml b/blueprints/admin/pages/modular_raw.yaml
similarity index 100%
rename from blueprints/pages/modular_raw.yaml
rename to blueprints/admin/pages/modular_raw.yaml
diff --git a/blueprints/pages/move.yaml b/blueprints/admin/pages/move.yaml
similarity index 100%
rename from blueprints/pages/move.yaml
rename to blueprints/admin/pages/move.yaml
diff --git a/blueprints/pages/new.yaml b/blueprints/admin/pages/new.yaml
similarity index 100%
rename from blueprints/pages/new.yaml
rename to blueprints/admin/pages/new.yaml
diff --git a/blueprints/pages/new_folder.yaml b/blueprints/admin/pages/new_folder.yaml
similarity index 100%
rename from blueprints/pages/new_folder.yaml
rename to blueprints/admin/pages/new_folder.yaml
diff --git a/blueprints/pages/raw.yaml b/blueprints/admin/pages/raw.yaml
similarity index 100%
rename from blueprints/pages/raw.yaml
rename to blueprints/admin/pages/raw.yaml
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index 6ade8fe2..695c1b8d 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -258,7 +258,7 @@
             {% if context.blueprints.fields and admin.session.expert == '0' %}
                 {% include 'partials/blueprints.html.twig' with { blueprints: context.blueprints, data: context } %}
             {% else %}
-                {% include 'partials/blueprints-raw.html.twig' with { blueprints: admin.blueprints('pages/'~modular~'raw'), data: context } %}
+                {% include 'partials/blueprints-raw.html.twig' with { blueprints: admin.blueprints('admin/pages/'~modular~'raw'), data: context } %}
             {% endif %}
         </div>
     {% else %}
@@ -293,15 +293,15 @@
     {% if mode == 'list' %}
 
         <div class="remodal" data-remodal-id="modal" data-remodal-options="hashTracking: false">
-            {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('pages/new'), data: context } %}
+            {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('admin/pages/new'), data: context } %}
         </div>
 
         <div class="remodal" data-remodal-id="modal-folder" data-remodal-options="hashTracking: false">
-            {% include 'partials/blueprints-new-folder.html.twig' with { blueprints: admin.blueprints('pages/new_folder'), data: context } %}
+            {% include 'partials/blueprints-new-folder.html.twig' with { blueprints: admin.blueprints('admin/pages/new_folder'), data: context } %}
         </div>
 
         <div class="remodal" data-remodal-id="modular" data-remodal-options="hashTracking: false">
-            {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('pages/modular_new'), data: context } %}
+            {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('admin/pages/modular_new'), data: context } %}
         </div>
 
     {% endif %}
@@ -309,7 +309,7 @@
     {% if mode == 'edit' %}
     <div class="remodal" data-remodal-id="move" data-remodal-options="hashTracking: false">
 
-        {% include 'partials/page-move.html.twig' with { blueprints: admin.blueprints('pages/move'), data: context } %}
+        {% include 'partials/page-move.html.twig' with { blueprints: admin.blueprints('admin/pages/move'), data: context } %}
     </div>
     <div class="remodal" data-remodal-id="revisions" data-remodal-options="hashTracking: false">
         {% include ['partials/page-revisions.html.twig', 'empty.html.twig'] with { data: context } %}