diff --git a/Dispatcher/Dispatcher.php b/Dispatcher/Dispatcher.php
index 6540a5e47..49b60b33a 100644
--- a/Dispatcher/Dispatcher.php
+++ b/Dispatcher/Dispatcher.php
@@ -19,7 +19,7 @@ use phpOMS\ApplicationAbstract;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\System\FilePathException;
+use phpOMS\System\File\PathException;
 use phpOMS\Views\ViewLayout;
 
 /**
@@ -131,7 +131,7 @@ class Dispatcher
     {
         if (!isset($this->controllers[$controller])) {
             if (realpath($path = ROOT_PATH . '/' . str_replace('\\', '/', $controller) . '.php') === false) {
-                throw new FilePathException($path);
+                throw new PathException($path);
             }
 
             $this->controllers[$controller] = new $controller($this->app);
diff --git a/Log/FileLogger.php b/Log/FileLogger.php
index 6d765993f..57a346aff 100644
--- a/Log/FileLogger.php
+++ b/Log/FileLogger.php
@@ -16,7 +16,7 @@
 namespace phpOMS\Log;
 
 use phpOMS\Datatypes\Exception\InvalidEnumValue;
-use phpOMS\System\FilePathException;
+use phpOMS\System\File\PathException;
 use phpOMS\Validation\Validator;
 
 /**
@@ -88,7 +88,7 @@ class FileLogger implements LoggerInterface
         $path = realpath($lpath);
 
         if ($path !== false && Validator::startsWith($path, ROOT_PATH) === false) {
-            throw new FilePathException($lpath);
+            throw new PathException($lpath);
         }
 
         if (is_dir($lpath)) {
diff --git a/Module/InfoManager.php b/Module/InfoManager.php
index 275d008ed..d0ad53b61 100644
--- a/Module/InfoManager.php
+++ b/Module/InfoManager.php
@@ -15,7 +15,7 @@
  */
 namespace phpOMS\Module;
 
-use phpOMS\System\FilePathException;
+use phpOMS\System\File\PathException;
 use phpOMS\Utils\ArrayUtils;
 use phpOMS\Validation\Validator;
 
@@ -62,7 +62,7 @@ class InfoManager
     public function __construct(string $module)
     {
         if (($path = realpath($oldPath = ModuleAbstract::MODULE_PATH . '/' . $module . '/info.json')) === false || Validator::startsWith($path, ModuleAbstract::MODULE_PATH)) {
-            throw new FilePathException($oldPath);
+            throw new PathException($oldPath);
         }
 
         $this->path = $path;
diff --git a/Module/ModuleAbstract.php b/Module/ModuleAbstract.php
index cee1efdf2..564a8ce24 100644
--- a/Module/ModuleAbstract.php
+++ b/Module/ModuleAbstract.php
@@ -15,7 +15,7 @@
  */
 namespace phpOMS\Module;
 
-use phpOMS\System\FilePathException;
+use phpOMS\System\File\PathException;
 
 
 /**
@@ -152,7 +152,7 @@ abstract class ModuleAbstract
             /** @noinspection PhpUnusedLocalVariableInspection */
             foreach (static::$localization[$destination] as $file) {
                 if (($path = realpath($oldPath = __DIR__ . '/../../Modules/' . static::MODULE_NAME . '/Theme/' . $destination . '/Lang/' . $language . '.lang.php')) === false) {
-                    throw new FilePathException($oldPath);
+                    throw new PathException($oldPath);
                 }
 
                 /** @noinspection PhpIncludeInspection */
diff --git a/Module/ModuleManager.php b/Module/ModuleManager.php
index 6226ca460..a64f5473a 100644
--- a/Module/ModuleManager.php
+++ b/Module/ModuleManager.php
@@ -19,7 +19,7 @@ use phpOMS\ApplicationAbstract;
 use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\Log\FileLogger;
 use phpOMS\Message\Http\Request;
-use phpOMS\System\FilePathException;
+use phpOMS\System\File\PathException;
 use phpOMS\Utils\IO\Json\InvalidJsonException;
 
 /**
@@ -250,7 +250,7 @@ class ModuleManager
 
                 if (file_exists($path)) {
                     if (strpos($path, self::MODULE_PATH) === false) {
-                        throw new FilePathException($oldPath);
+                        throw new PathException($oldPath);
                     }
 
                     $json                                 = json_decode(file_get_contents($path), true);
@@ -300,7 +300,7 @@ class ModuleManager
 
         if ($path !== false) {
             if (strpos($path, self::MODULE_PATH) === false) {
-                throw new FilePathException($oldPath);
+                throw new PathException($oldPath);
             }
 
             $info = json_decode(file_get_contents($path), true);
diff --git a/System/FilePathException.php b/System/File/PathException.php
similarity index 95%
rename from System/FilePathException.php
rename to System/File/PathException.php
index a24204166..5a8d3b894 100644
--- a/System/FilePathException.php
+++ b/System/File/PathException.php
@@ -28,7 +28,7 @@ namespace phpOMS\System;
  * @link       http://orange-management.com
  * @since      1.0.0
  */
-class FilePathException extends \UnexpectedValueException
+class PathException extends \UnexpectedValueException
 {
     /**
      * Constructor.
diff --git a/System/FileSystem.php b/System/FileSystem.php
index 1ffa85ea7..e638df374 100644
--- a/System/FileSystem.php
+++ b/System/FileSystem.php
@@ -91,7 +91,7 @@ class FileSystem
     {
         $path = realpath($oldPath = $path);
         if ($path === false || !is_dir($path) || Validator::startsWith($path, ROOT_PATH)) {
-            throw new FilePathException($oldPath);
+            throw new PathException($oldPath);
         }
 
         $files = scandir($path);
diff --git a/Version/Version.php b/Version/Version.php
index fa07fff37..00d7a9a8b 100644
--- a/Version/Version.php
+++ b/Version/Version.php
@@ -14,7 +14,7 @@
  * @link       http://orange-management.com
  */
 namespace phpOMS\Version;
-use phpOMS\System\FilePathException;
+use phpOMS\System\File\PathException;
 use phpOMS\Validation\Validator;
 
 /**
diff --git a/Views/View.php b/Views/View.php
index a6aa11028..74f8c5a3b 100644
--- a/Views/View.php
+++ b/Views/View.php
@@ -20,7 +20,7 @@ use phpOMS\Contract\RenderableInterface;
 use phpOMS\Localization\Localization;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\System\FilePathException;
+use phpOMS\System\File\PathException;
 use phpOMS\Validation\Validator;
 
 /**
@@ -283,7 +283,7 @@ class View implements RenderableInterface
         $path = realpath($oldPath = __DIR__ . '/../..' . $this->template . '.tpl.php');
 
         if ($path === false || Validator::startsWith($path, ROOT_PATH) === false) {
-            throw new FilePathException($oldPath);
+            throw new PathException($oldPath);
         }
 
         ob_start();