diff --git a/app/class/Config.php b/app/class/Config.php
index ebb7597d..61f4c396 100644
--- a/app/class/Config.php
+++ b/app/class/Config.php
@@ -2,6 +2,8 @@
 
 namespace Wcms;
 
+use Wcms\Exception\Filesystemexception;
+
 abstract class Config
 {
     protected static $pagetable = 'mystore';
diff --git a/app/class/Controlleradmin.php b/app/class/Controlleradmin.php
index 436ee27a..92ec97f8 100644
--- a/app/class/Controlleradmin.php
+++ b/app/class/Controlleradmin.php
@@ -3,6 +3,7 @@
 namespace Wcms;
 
 use RuntimeException;
+use Wcms\Exception\Filesystemexception;
 
 class Controlleradmin extends Controller
 {
diff --git a/app/class/Controllerapimedia.php b/app/class/Controllerapimedia.php
index cfa30398..4322456a 100644
--- a/app/class/Controllerapimedia.php
+++ b/app/class/Controllerapimedia.php
@@ -5,6 +5,7 @@
 use AltoRouter;
 use Error;
 use RuntimeException;
+use Wcms\Exception\Filesystemexception;
 
 class Controllerapimedia extends Controllerapi
 {
diff --git a/app/class/Controllermedia.php b/app/class/Controllermedia.php
index 9e6e8c32..d5cfea2d 100644
--- a/app/class/Controllermedia.php
+++ b/app/class/Controllermedia.php
@@ -4,6 +4,7 @@
 
 use AltoRouter;
 use RuntimeException;
+use Wcms\Exception\Filesystemexception\Folderexception;
 use Wcms\Exception\Forbiddenexception;
 
 class Controllermedia extends Controller
diff --git a/app/class/Controllerpage.php b/app/class/Controllerpage.php
index 7b7acdc8..2584f26f 100644
--- a/app/class/Controllerpage.php
+++ b/app/class/Controllerpage.php
@@ -4,6 +4,7 @@
 
 use DateTimeImmutable;
 use RuntimeException;
+use Wcms\Exception\Filesystemexception;
 
 class Controllerpage extends Controller
 {
diff --git a/app/class/Filesystemexception.php b/app/class/Exception/Filesystemexception.php
similarity index 76%
rename from app/class/Filesystemexception.php
rename to app/class/Exception/Filesystemexception.php
index f79874c6..6d0e8be9 100644
--- a/app/class/Filesystemexception.php
+++ b/app/class/Exception/Filesystemexception.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wcms;
+namespace Wcms\Exception;
 
 use RuntimeException;
 
diff --git a/app/class/Chmodexception.php b/app/class/Exception/Filesystemexception/Chmodexception.php
similarity index 79%
rename from app/class/Chmodexception.php
rename to app/class/Exception/Filesystemexception/Chmodexception.php
index b74014eb..fcb1bf79 100644
--- a/app/class/Chmodexception.php
+++ b/app/class/Exception/Filesystemexception/Chmodexception.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Wcms;
+namespace Wcms\Exception\Filesystemexception;
+
+use Wcms\Exception\Filesystemexception;
 
 class Chmodexception extends Filesystemexception
 {
diff --git a/app/class/Exception/Filesystemexception/Fileexception.php b/app/class/Exception/Filesystemexception/Fileexception.php
new file mode 100644
index 00000000..d2d93ac1
--- /dev/null
+++ b/app/class/Exception/Filesystemexception/Fileexception.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Wcms\Exception\Filesystemexception;
+
+use Wcms\Exception\Filesystemexception;
+
+class Fileexception extends Filesystemexception
+{
+}
diff --git a/app/class/Exception/Filesystemexception/Folderexception.php b/app/class/Exception/Filesystemexception/Folderexception.php
new file mode 100644
index 00000000..6e703d2f
--- /dev/null
+++ b/app/class/Exception/Filesystemexception/Folderexception.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Wcms\Exception\Filesystemexception;
+
+use Wcms\Exception\Filesystemexception;
+
+class Folderexception extends Filesystemexception
+{
+}
diff --git a/app/class/Notfoundexception.php b/app/class/Exception/Filesystemexception/Notfoundexception.php
similarity index 87%
rename from app/class/Notfoundexception.php
rename to app/class/Exception/Filesystemexception/Notfoundexception.php
index f2be37ba..bb76d515 100644
--- a/app/class/Notfoundexception.php
+++ b/app/class/Exception/Filesystemexception/Notfoundexception.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Wcms;
+namespace Wcms\Exception\Filesystemexception;
 
 use Throwable;
+use Wcms\Exception\Filesystemexception;
 
 /**
  * File not found
diff --git a/app/class/Unlinkexception.php b/app/class/Exception/Filesystemexception/Unlinkexception.php
similarity index 88%
rename from app/class/Unlinkexception.php
rename to app/class/Exception/Filesystemexception/Unlinkexception.php
index 53a27dc6..5e1f450f 100644
--- a/app/class/Unlinkexception.php
+++ b/app/class/Exception/Filesystemexception/Unlinkexception.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Wcms;
+namespace Wcms\Exception\Filesystemexception;
 
 use Throwable;
+use Wcms\Exception\Filesystemexception;
 
 /**
  * Error while trying to unlink file on the filesystem
diff --git a/app/class/Fileexception.php b/app/class/Fileexception.php
deleted file mode 100644
index 8b8e3b46..00000000
--- a/app/class/Fileexception.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Wcms;
-
-class Fileexception extends Filesystemexception
-{
-}
diff --git a/app/class/Folderexception.php b/app/class/Folderexception.php
deleted file mode 100644
index d713c7d0..00000000
--- a/app/class/Folderexception.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Wcms;
-
-class Folderexception extends Filesystemexception
-{
-}
diff --git a/app/class/Fs.php b/app/class/Fs.php
index 18f75f79..f3f98a10 100644
--- a/app/class/Fs.php
+++ b/app/class/Fs.php
@@ -4,7 +4,12 @@
 
 use DomainException;
 use LogicException;
-use RuntimeException;
+use Wcms\Exception\Filesystemexception;
+use Wcms\Exception\Filesystemexception\Chmodexception;
+use Wcms\Exception\Filesystemexception\Fileexception;
+use Wcms\Exception\Filesystemexception\Folderexception;
+use Wcms\Exception\Filesystemexception\Notfoundexception;
+use Wcms\Exception\Filesystemexception\Unlinkexception;
 
 /**
  * File system related tools. No Wcms specific param should be set here.
diff --git a/app/class/Media.php b/app/class/Media.php
index d6a97cfb..3641c3a0 100644
--- a/app/class/Media.php
+++ b/app/class/Media.php
@@ -5,6 +5,7 @@
 use DateTime;
 use DomainException;
 use RuntimeException;
+use Wcms\Exception\Filesystemexception\Fileexception;
 
 class Media extends Item
 {
diff --git a/app/class/Modelmedia.php b/app/class/Modelmedia.php
index 9f9c0cb7..71409865 100644
--- a/app/class/Modelmedia.php
+++ b/app/class/Modelmedia.php
@@ -8,7 +8,9 @@
 use RuntimeException;
 use Imagick;
 use ImagickException;
-use RangeException;
+use Wcms\Exception\Filesystemexception;
+use Wcms\Exception\Filesystemexception\Fileexception;
+use Wcms\Exception\Filesystemexception\Folderexception;
 use Wcms\Exception\Forbiddenexception;
 
 class Modelmedia extends Model
diff --git a/app/class/Modelpage.php b/app/class/Modelpage.php
index 21fe4b81..5a36ded0 100644
--- a/app/class/Modelpage.php
+++ b/app/class/Modelpage.php
@@ -10,6 +10,8 @@
 use InvalidArgumentException;
 use RangeException;
 use RuntimeException;
+use Wcms\Exception\Filesystemexception;
+use Wcms\Exception\Filesystemexception\Notfoundexception;
 
 class Modelpage extends Modeldb
 {
diff --git a/app/class/Servicefont.php b/app/class/Servicefont.php
index bb375024..93eb5363 100644
--- a/app/class/Servicefont.php
+++ b/app/class/Servicefont.php
@@ -2,7 +2,8 @@
 
 namespace Wcms;
 
-use RuntimeException ;
+use RuntimeException;
+use Wcms\Exception\Filesystemexception;
 
 class Servicefont
 {
diff --git a/app/class/Servicerss.php b/app/class/Servicerss.php
index 28385f2f..e264eed4 100644
--- a/app/class/Servicerss.php
+++ b/app/class/Servicerss.php
@@ -12,7 +12,10 @@
 use LogicException;
 use RuntimeException;
 use Wcms\Exception\Database\Notfoundexception;
-use Wcms\Notfoundexception as WcmsNotfoundexception;
+use Wcms\Exception\Filesystemexception;
+use Wcms\Exception\Filesystemexception\Folderexception;
+use Wcms\Exception\Filesystemexception\Notfoundexception as FilesystemexceptionNotfoundexception;
+use Wcms\Exception\Filesystemexception\Unlinkexception;
 
 class Servicerss
 {
@@ -233,7 +236,7 @@ public static function removeatom(string $id): void
     {
         try {
             Fs::deletefile(self::atomfile($id));
-        } catch (WcmsNotfoundexception $e) {
+        } catch (FilesystemexceptionNotfoundexception $e) {
             // do nothing, this means file is already deleted
         } catch (Unlinkexception $e) {
             throw new RuntimeException("RSS atom file deletion error", 0, $e);
diff --git a/app/class/Servicetags.php b/app/class/Servicetags.php
index 5bb26aaa..12e18352 100644
--- a/app/class/Servicetags.php
+++ b/app/class/Servicetags.php
@@ -2,7 +2,9 @@
 
 namespace Wcms;
 
-use Exception;
+use Wcms\Exception\Filesystemexception;
+use Wcms\Exception\Filesystemexception\Fileexception;
+use Wcms\Exception\Filesystemexception\Notfoundexception;
 
 class Servicetags
 {
@@ -16,7 +18,7 @@ public function taglist(): array
         try {
             $tagfile = Fs::readfile(Model::TAGS_FILE);
         } catch (Notfoundexception $e) {
-            // This mean the tag fille does not exist
+            // This mean the tag file does not exist
             return [];
         }
         $tagdata = json_decode($tagfile, true);
diff --git a/app/fn/fn.php b/app/fn/fn.php
index 34a579b5..1fbd6caa 100644
--- a/app/fn/fn.php
+++ b/app/fn/fn.php
@@ -1,6 +1,6 @@
 <?php
 
-use Wcms\Folderexception;
+use Wcms\Exception\Filesystemexception\Folderexception;
 
 function readablesize($bytes, $base = 2 ** 10)
 {