diff --git a/bin/wpinit b/bin/wpinit
index cde9077afc91f82a5f16b2f2a70b5c8c45433089..e23eed6e2635b1e9c844ed06214edef00eec0ef7 100755
--- a/bin/wpinit
+++ b/bin/wpinit
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use WPDesk\Init\Dumper\PhpFileDumper;
+use WPDesk\Init\Util\PhpFileDumper;
 
 include $_composer_autoload_path ?? __DIR__ . '/../vendor/autoload.php';
 
diff --git a/src/Binding/Loader/FilesystemDefinitions.php b/src/Binding/Loader/FilesystemDefinitions.php
index 6bbd4abb9bc842a5327874c762c2a7c680ec65aa..d46262d3cdcbce769e6cd1b8cabbfc03de7a2f8d 100644
--- a/src/Binding/Loader/FilesystemDefinitions.php
+++ b/src/Binding/Loader/FilesystemDefinitions.php
@@ -5,7 +5,7 @@ namespace WPDesk\Init\Binding\Loader;
 
 use WPDesk\Init\Binding\DefinitionFactory;
 use WPDesk\Init\Util\Path;
-use WPDesk\Init\Loader\PhpFileLoader;
+use WPDesk\Init\Util\PhpFileLoader;
 
 class FilesystemDefinitions implements BindingDefinitions {
 
diff --git a/src/Init.php b/src/Init.php
index b0b8a4797f3337554a9d682d28b43ad259607f5c..504f76de690dc0853dd3ee8e33433b32049e563d 100644
--- a/src/Init.php
+++ b/src/Init.php
@@ -9,7 +9,7 @@ use WPDesk\Init\Extension\LegacyExtension;
 use WPDesk\Init\Extension\BuiltinExtension;
 use WPDesk\Init\Extension\ConfigExtension;
 use WPDesk\Init\Extension\ExtensionsSet;
-use WPDesk\Init\Loader\PhpFileLoader;
+use WPDesk\Init\Util\PhpFileLoader;
 use WPDesk\Init\Configuration\Configuration;
 
 final class Init {
diff --git a/src/Kernel.php b/src/Kernel.php
index ec12620cef47e156997e7a281115e383c7021f0f..ccd157fa7ea1f0ff1b79f791806b5c18c430eaf7 100644
--- a/src/Kernel.php
+++ b/src/Kernel.php
@@ -18,7 +18,7 @@ use WPDesk\Init\HookDriver\CompositeDriver;
 use WPDesk\Init\HookDriver\GenericDriver;
 use WPDesk\Init\HookDriver\HookDriver;
 use WPDesk\Init\HookDriver\LegacyDriver;
-use WPDesk\Init\Loader\PhpFileLoader;
+use WPDesk\Init\Util\PhpFileLoader;
 use WPDesk\Init\Plugin\Header;
 use WPDesk\Init\Util\Path;
 use WPDesk\Init\Plugin\DefaultHeaderParser;
diff --git a/src/Dumper/PhpFileDumper.php b/src/Util/PhpFileDumper.php
similarity index 98%
rename from src/Dumper/PhpFileDumper.php
rename to src/Util/PhpFileDumper.php
index 05302823a2ddeec32aeec8ed5ee0da1e318a7792..8bc45f9644b4a3bebca72143d0dae353395972b7 100644
--- a/src/Dumper/PhpFileDumper.php
+++ b/src/Util/PhpFileDumper.php
@@ -1,7 +1,7 @@
 <?php
 declare( strict_types=1 );
 
-namespace WPDesk\Init\Dumper;
+namespace WPDesk\Init\Util;
 
 class PhpFileDumper {
 
diff --git a/src/Loader/PhpFileLoader.php b/src/Util/PhpFileLoader.php
similarity index 94%
rename from src/Loader/PhpFileLoader.php
rename to src/Util/PhpFileLoader.php
index af872a89681aa1d5aa6ba17e3797c468655ded24..81209c46c0eff17b968e557eff3dfeeb0c79de03 100644
--- a/src/Loader/PhpFileLoader.php
+++ b/src/Util/PhpFileLoader.php
@@ -1,7 +1,7 @@
 <?php
 declare( strict_types=1 );
 
-namespace WPDesk\Init\Loader;
+namespace WPDesk\Init\Util;
 
 class PhpFileLoader {