diff --git a/_test/tests/inc/Utils/PageResolverTest.php b/_test/tests/inc/File/PageResolverTest.php
similarity index 99%
rename from _test/tests/inc/Utils/PageResolverTest.php
rename to _test/tests/inc/File/PageResolverTest.php
index 709aa6809..7d93fddf7 100644
--- a/_test/tests/inc/Utils/PageResolverTest.php
+++ b/_test/tests/inc/File/PageResolverTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace tests\inc\Utils;
+namespace tests\inc\File;
 
-use dokuwiki\Utils\PageResolver;
+use dokuwiki\File\PageResolver;
 
 /**
  * @todo tests that make use of revisions might be wanted
diff --git a/bin/wantedpages.php b/bin/wantedpages.php
index 4fb778ec4..3eb03349a 100755
--- a/bin/wantedpages.php
+++ b/bin/wantedpages.php
@@ -2,7 +2,7 @@
 <?php
 
 use dokuwiki\Utf8\Sort;
-use dokuwiki\Utils\PageResolver;
+use dokuwiki\File\PageResolver;
 use splitbrain\phpcli\CLI;
 use splitbrain\phpcli\Options;
 
diff --git a/inc/Utils/MediaResolver.php b/inc/File/MediaResolver.php
similarity index 91%
rename from inc/Utils/MediaResolver.php
rename to inc/File/MediaResolver.php
index 203a6cf43..098584e72 100644
--- a/inc/Utils/MediaResolver.php
+++ b/inc/File/MediaResolver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace dokuwiki\Utils;
+namespace dokuwiki\File;
 
 /**
  * Creates an absolute media ID from a relative one
diff --git a/inc/Utils/PageResolver.php b/inc/File/PageResolver.php
similarity index 98%
rename from inc/Utils/PageResolver.php
rename to inc/File/PageResolver.php
index d6bcfdf41..7ed5b1cd8 100644
--- a/inc/Utils/PageResolver.php
+++ b/inc/File/PageResolver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace dokuwiki\Utils;
+namespace dokuwiki\File;
 
 /**
  * Creates an absolute page ID from a relative one
diff --git a/inc/Utils/Resolver.php b/inc/File/Resolver.php
similarity index 99%
rename from inc/Utils/Resolver.php
rename to inc/File/Resolver.php
index 746328616..0d334ee68 100644
--- a/inc/Utils/Resolver.php
+++ b/inc/File/Resolver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace dokuwiki\Utils;
+namespace dokuwiki\File;
 
 /**
  * Resolving relative IDs to absolute ones
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 611027166..32501d036 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -9,8 +9,8 @@
 
 use dokuwiki\ChangeLog\MediaChangeLog;
 use dokuwiki\ChangeLog\PageChangeLog;
-use dokuwiki\Utils\MediaResolver;
-use dokuwiki\Utils\PageResolver;
+use dokuwiki\File\MediaResolver;
+use dokuwiki\File\PageResolver;
 
 /**
  * Fetch the an ID from request
@@ -481,7 +481,7 @@ function localeFN($id,$ext='txt'){
  */
 function resolve_id($ns,$id,$clean=true){
     global $conf;
-    dbg_deprecated(\dokuwiki\Utils\Resolver::class.' and its children');
+    dbg_deprecated(\dokuwiki\File\Resolver::class.' and its children');
 
     // some pre cleaning for useslash:
     if($conf['useslash']) $id = str_replace('/',':',$id);
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 294dd751a..3a0ad4f5f 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -477,7 +477,7 @@ class Doku_Renderer_metadata extends Doku_Renderer
         $default = $this->_simpleTitle($id);
 
         // first resolve and clean up the $id
-        $resolver = new \dokuwiki\Utils\PageResolver($ID);
+        $resolver = new \dokuwiki\File\PageResolver($ID);
         $id = $resolver->resolveId($id);
         @list($page) = explode('#', $id, 2);
 
@@ -722,7 +722,7 @@ class Doku_Renderer_metadata extends Doku_Renderer
 
         list($src) = explode('#', $src, 2);
         if (!media_isexternal($src)) {
-            $src = (new \dokuwiki\Utils\MediaResolver($ID))->resolveId($src);
+            $src = (new \dokuwiki\File\MediaResolver($ID))->resolveId($src);
         }
         if (preg_match('/.(jpe?g|gif|png)$/i', $src)) {
             $this->firstimage = $src;
@@ -742,7 +742,7 @@ class Doku_Renderer_metadata extends Doku_Renderer
         if (media_isexternal($src)) {
             return;
         }
-        $src = (new \dokuwiki\Utils\MediaResolver($ID))->resolveId($src);
+        $src = (new \dokuwiki\File\MediaResolver($ID))->resolveId($src);
         $file = mediaFN($src);
         $this->meta['relation']['media'][$src] = file_exists($file);
     }
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index b6426fd91..feeef0fe6 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -1,8 +1,8 @@
 <?php
 
 use dokuwiki\ChangeLog\MediaChangeLog;
-use dokuwiki\Utils\MediaResolver;
-use dokuwiki\Utils\PageResolver;
+use dokuwiki\File\MediaResolver;
+use dokuwiki\File\PageResolver;
 
 /**
  * Renderer for XHTML output
diff --git a/inc/template.php b/inc/template.php
index 26eaef333..c70d9f9fb 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -8,7 +8,7 @@
 
 use dokuwiki\Extension\AdminPlugin;
 use dokuwiki\Extension\Event;
-use dokuwiki\Utils\PageResolver;
+use dokuwiki\File\PageResolver;
 
 /**
  * Access a template file