diff --git a/examples/plugins/ClassUnqualifier.php b/examples/plugins/ClassUnqualifier.php
index f94b1cfe7..5fac4dcd8 100644
--- a/examples/plugins/ClassUnqualifier.php
+++ b/examples/plugins/ClassUnqualifier.php
@@ -3,7 +3,7 @@ namespace Psalm\Example\Plugin;
 
 use Psalm\Codebase;
 use Psalm\CodeLocation;
-use Psalm\FileManipulation\FileManipulation;
+use Psalm\FileManipulation;
 use Psalm\FileSource;
 use Psalm\Plugin\Hook\AfterClassLikeExistenceCheckInterface;
 use Psalm\StatementsSource;
diff --git a/examples/plugins/StringChecker.php b/examples/plugins/StringChecker.php
index dd3f96f3e..604abb2b6 100644
--- a/examples/plugins/StringChecker.php
+++ b/examples/plugins/StringChecker.php
@@ -7,7 +7,7 @@ use Psalm\Checker\StatementsChecker;
 use Psalm\Codebase;
 use Psalm\CodeLocation;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulation;
+use Psalm\FileManipulation;
 use Psalm\IssueBuffer;
 use Psalm\Issue\TypeCoercion;
 use Psalm\Plugin\Hook\AfterExpressionAnalysisInterface;
diff --git a/examples/plugins/composer-based/echo-checker/EchoChecker.php b/examples/plugins/composer-based/echo-checker/EchoChecker.php
index a90be136b..4d739e8c5 100644
--- a/examples/plugins/composer-based/echo-checker/EchoChecker.php
+++ b/examples/plugins/composer-based/echo-checker/EchoChecker.php
@@ -5,7 +5,7 @@ use PhpParser;
 use Psalm\Codebase;
 use Psalm\CodeLocation;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulation;
+use Psalm\FileManipulation;
 use Psalm\IssueBuffer;
 use Psalm\Issue\TypeCoercion;
 use Psalm\Plugin\Hook\AfterStatementAnalysisInterface;
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 90c2272a9..662702fc6 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -71,7 +71,7 @@
 
         <UnusedProperty>
             <errorLevel type="info">
-                <file name="src/Psalm/FileManipulation/FunctionDocblockManipulator.php" />
+                <file name="src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php" />
             </errorLevel>
         </UnusedProperty>
 
diff --git a/src/Psalm/Codebase.php b/src/Psalm/Codebase.php
index 491dc7073..69114751b 100644
--- a/src/Psalm/Codebase.php
+++ b/src/Psalm/Codebase.php
@@ -98,42 +98,42 @@ class Codebase
     public $find_unused_code = false;
 
     /**
-     * @var Codebase\Reflection
+     * @var Internal\Codebase\Reflection
      */
     private $reflection;
 
     /**
-     * @var Codebase\Scanner
+     * @var Internal\Codebase\Scanner
      */
     public $scanner;
 
     /**
-     * @var Codebase\Analyzer
+     * @var Internal\Codebase\Analyzer
      */
     public $analyzer;
 
     /**
-     * @var Codebase\Functions
+     * @var Internal\Codebase\Functions
      */
     public $functions;
 
     /**
-     * @var Codebase\ClassLikes
+     * @var Internal\Codebase\ClassLikes
      */
     public $classlikes;
 
     /**
-     * @var Codebase\Methods
+     * @var Internal\Codebase\Methods
      */
     public $methods;
 
     /**
-     * @var Codebase\Properties
+     * @var Internal\Codebase\Properties
      */
     public $properties;
 
     /**
-     * @var Codebase\Populator
+     * @var Internal\Codebase\Populator
      */
     public $populator;
 
@@ -179,9 +179,9 @@ class Codebase
 
         self::$stubbed_constants = [];
 
-        $this->reflection = new Codebase\Reflection($providers->classlike_storage_provider, $this);
+        $this->reflection = new Internal\Codebase\Reflection($providers->classlike_storage_provider, $this);
 
-        $this->scanner = new Codebase\Scanner(
+        $this->scanner = new Internal\Codebase\Scanner(
             $this,
             $config,
             $providers->file_storage_provider,
@@ -193,24 +193,24 @@ class Codebase
 
         $this->loadAnalyzer();
 
-        $this->functions = new Codebase\Functions($providers->file_storage_provider, $this->reflection);
-        $this->methods = new Codebase\Methods(
+        $this->functions = new Internal\Codebase\Functions($providers->file_storage_provider, $this->reflection);
+        $this->methods = new Internal\Codebase\Methods(
             $config,
             $providers->classlike_storage_provider,
             $providers->file_reference_provider
         );
-        $this->properties = new Codebase\Properties(
+        $this->properties = new Internal\Codebase\Properties(
             $providers->classlike_storage_provider,
             $providers->file_reference_provider
         );
 
-        $this->classlikes = new Codebase\ClassLikes(
+        $this->classlikes = new Internal\Codebase\ClassLikes(
             $this->config,
             $providers->classlike_storage_provider,
             $this->scanner,
             $this->methods
         );
-        $this->populator = new Codebase\Populator(
+        $this->populator = new Internal\Codebase\Populator(
             $config,
             $providers->classlike_storage_provider,
             $providers->file_storage_provider,
@@ -227,7 +227,7 @@ class Codebase
      */
     private function loadAnalyzer()
     {
-        $this->analyzer = new Codebase\Analyzer(
+        $this->analyzer = new Internal\Codebase\Analyzer(
             $this->config,
             $this->file_provider,
             $this->file_storage_provider,
diff --git a/src/Psalm/FileManipulation/FileManipulation.php b/src/Psalm/FileManipulation.php
similarity index 92%
rename from src/Psalm/FileManipulation/FileManipulation.php
rename to src/Psalm/FileManipulation.php
index 74c07609f..e4725d110 100644
--- a/src/Psalm/FileManipulation/FileManipulation.php
+++ b/src/Psalm/FileManipulation.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\FileManipulation;
+namespace Psalm;
 
 class FileManipulation
 {
diff --git a/src/Psalm/Internal/Analyzer/ClassLikeAnalyzer.php b/src/Psalm/Internal/Analyzer/ClassLikeAnalyzer.php
index 649d7e3f6..80dd30440 100644
--- a/src/Psalm/Internal/Analyzer/ClassLikeAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/ClassLikeAnalyzer.php
@@ -7,7 +7,7 @@ use Psalm\Codebase;
 use Psalm\CodeLocation;
 use Psalm\Config;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulationBuffer;
+use Psalm\Internal\FileManipulation\FileManipulationBuffer;
 use Psalm\Issue\DuplicateClass;
 use Psalm\Issue\InaccessibleProperty;
 use Psalm\Issue\InvalidClass;
diff --git a/src/Psalm/Internal/Analyzer/FileAnalyzer.php b/src/Psalm/Internal/Analyzer/FileAnalyzer.php
index 33ec7e66a..5d1f4316e 100644
--- a/src/Psalm/Internal/Analyzer/FileAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/FileAnalyzer.php
@@ -5,7 +5,7 @@ use PhpParser;
 use Psalm\Codebase;
 use Psalm\Context;
 use Psalm\Exception\UnpreparedAnalysisException;
-use Psalm\FileManipulation\FileManipulationBuffer;
+use Psalm\Internal\FileManipulation\FileManipulationBuffer;
 use Psalm\IssueBuffer;
 use Psalm\StatementsSource;
 use Psalm\Type;
diff --git a/src/Psalm/Internal/Analyzer/FunctionAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionAnalyzer.php
index 6950fd1df..c98cf6311 100644
--- a/src/Psalm/Internal/Analyzer/FunctionAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/FunctionAnalyzer.php
@@ -3,7 +3,7 @@ namespace Psalm\Internal\Analyzer;
 
 use PhpParser;
 use Psalm\Internal\Analyzer\Statements\Expression\AssertionFinder;
-use Psalm\Codebase\CallMap;
+use Psalm\Internal\Codebase\CallMap;
 use Psalm\Context;
 use Psalm\CodeLocation;
 use Psalm\Issue\InvalidArgument;
diff --git a/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php
index d710f9c65..0daa770cf 100644
--- a/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php
@@ -16,7 +16,7 @@ use Psalm\Internal\Analyzer\StatementsAnalyzer;
 use Psalm\Internal\Analyzer\TypeAnalyzer;
 use Psalm\CodeLocation;
 use Psalm\Context;
-use Psalm\FileManipulation\FunctionDocblockManipulator;
+use Psalm\Internal\FileManipulation\FunctionDocblockManipulator;
 use Psalm\Issue\InvalidFalsableReturnType;
 use Psalm\Issue\InvalidNullableReturnType;
 use Psalm\Issue\InvalidReturnType;
diff --git a/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
index c63b18cc2..d4eee7530 100644
--- a/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
@@ -9,10 +9,10 @@ use Psalm\Codebase;
 use Psalm\Internal\Analyzer\FunctionLike\ReturnTypeAnalyzer;
 use Psalm\Internal\Analyzer\FunctionLike\ReturnTypeCollector;
 use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
-use Psalm\Codebase\CallMap;
+use Psalm\Internal\Codebase\CallMap;
 use Psalm\CodeLocation;
 use Psalm\Context;
-use Psalm\FileManipulation\FunctionDocblockManipulator;
+use Psalm\Internal\FileManipulation\FunctionDocblockManipulator;
 use Psalm\Issue\InvalidParamDefault;
 use Psalm\Issue\MismatchingDocblockParamType;
 use Psalm\Issue\MissingClosureParamType;
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
index 0a1bdb550..6cf42c6d8 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
@@ -7,10 +7,10 @@ use Psalm\Internal\Analyzer\FunctionLikeAnalyzer;
 use Psalm\Internal\Analyzer\ProjectAnalyzer;
 use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
 use Psalm\Internal\Analyzer\StatementsAnalyzer;
-use Psalm\Codebase\CallMap;
+use Psalm\Internal\Codebase\CallMap;
 use Psalm\CodeLocation;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulationBuffer;
+use Psalm\Internal\FileManipulation\FileManipulationBuffer;
 use Psalm\Issue\ForbiddenCode;
 use Psalm\Issue\InvalidFunctionCall;
 use Psalm\Issue\NullFunctionCall;
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
index 7f8aaf8b5..0f2d97679 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
@@ -8,11 +8,11 @@ use Psalm\Internal\Analyzer\MethodAnalyzer;
 use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
 use Psalm\Internal\Analyzer\StatementsAnalyzer;
 use Psalm\Internal\Analyzer\TypeAnalyzer;
-use Psalm\Codebase\CallMap;
+use Psalm\Internal\Codebase\CallMap;
 use Psalm\CodeLocation;
 use Psalm\Config;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulationBuffer;
+use Psalm\Internal\FileManipulation\FileManipulationBuffer;
 use Psalm\Issue\InvalidMethodCall;
 use Psalm\Issue\InvalidPropertyAssignmentValue;
 use Psalm\Issue\InvalidScope;
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
index 2ab225e2e..039e03ead 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
@@ -10,7 +10,7 @@ use Psalm\Internal\Analyzer\StatementsAnalyzer;
 use Psalm\CodeLocation;
 use Psalm\Config;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulationBuffer;
+use Psalm\Internal\FileManipulation\FileManipulationBuffer;
 use Psalm\Issue\DeprecatedClass;
 use Psalm\Issue\InvalidStringClass;
 use Psalm\Issue\ParentNotFound;
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
index c51caf736..72be16271 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
@@ -8,7 +8,7 @@ use Psalm\Internal\Analyzer\MethodAnalyzer;
 use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
 use Psalm\Internal\Analyzer\StatementsAnalyzer;
 use Psalm\Internal\Analyzer\TypeAnalyzer;
-use Psalm\Codebase\CallMap;
+use Psalm\Internal\Codebase\CallMap;
 use Psalm\CodeLocation;
 use Psalm\Context;
 use Psalm\Issue\ImplicitToStringCast;
diff --git a/src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php
index 1817110ca..6cb212f11 100644
--- a/src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php
@@ -28,7 +28,7 @@ use Psalm\CodeLocation;
 use Psalm\Config;
 use Psalm\Context;
 use Psalm\Exception\DocblockParseException;
-use Psalm\FileManipulation\FileManipulationBuffer;
+use Psalm\Internal\FileManipulation\FileManipulationBuffer;
 use Psalm\FileSource;
 use Psalm\Issue\ForbiddenCode;
 use Psalm\Issue\InvalidCast;
diff --git a/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php b/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
index 65d95f3b0..b8e5a084e 100644
--- a/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
+++ b/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
@@ -23,8 +23,8 @@ use Psalm\Config;
 use Psalm\Context;
 use Psalm\DocComment;
 use Psalm\Exception\DocblockParseException;
-use Psalm\FileManipulation\FileManipulation;
-use Psalm\FileManipulation\FileManipulationBuffer;
+use Psalm\FileManipulation;
+use Psalm\Internal\FileManipulation\FileManipulationBuffer;
 use Psalm\Issue\ContinueOutsideLoop;
 use Psalm\Issue\ForbiddenCode;
 use Psalm\Issue\ForbiddenEcho;
diff --git a/src/Psalm/Codebase/Analyzer.php b/src/Psalm/Internal/Codebase/Analyzer.php
similarity index 99%
rename from src/Psalm/Codebase/Analyzer.php
rename to src/Psalm/Internal/Codebase/Analyzer.php
index 5b27c9a91..842b4b813 100644
--- a/src/Psalm/Codebase/Analyzer.php
+++ b/src/Psalm/Internal/Codebase/Analyzer.php
@@ -1,13 +1,13 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 use PhpParser;
 use Psalm\Internal\Analyzer\FileAnalyzer;
 use Psalm\Internal\Analyzer\ProjectAnalyzer;
 use Psalm\Config;
-use Psalm\FileManipulation\FileManipulation;
-use Psalm\FileManipulation\FileManipulationBuffer;
-use Psalm\FileManipulation\FunctionDocblockManipulator;
+use Psalm\FileManipulation;
+use Psalm\Internal\FileManipulation\FileManipulationBuffer;
+use Psalm\Internal\FileManipulation\FunctionDocblockManipulator;
 use Psalm\IssueBuffer;
 use Psalm\Internal\Provider\ClassLikeStorageProvider;
 use Psalm\Internal\Provider\FileProvider;
diff --git a/src/Psalm/Codebase/CallMap.php b/src/Psalm/Internal/Codebase/CallMap.php
similarity index 97%
rename from src/Psalm/Codebase/CallMap.php
rename to src/Psalm/Internal/Codebase/CallMap.php
index e7b32894b..6b8ecdfc1 100644
--- a/src/Psalm/Codebase/CallMap.php
+++ b/src/Psalm/Internal/Codebase/CallMap.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 use Psalm\Type;
 use Psalm\Storage\FunctionLikeParameter;
@@ -136,7 +136,7 @@ class CallMap
         }
 
         /** @var array<string, array<int|string, string>> */
-        $call_map = require_once(__DIR__ . '/../Internal/CallMap.php');
+        $call_map = require_once(__DIR__ . '/../CallMap.php');
 
         self::$call_map = [];
 
diff --git a/src/Psalm/Codebase/ClassLikes.php b/src/Psalm/Internal/Codebase/ClassLikes.php
similarity index 99%
rename from src/Psalm/Codebase/ClassLikes.php
rename to src/Psalm/Internal/Codebase/ClassLikes.php
index 8705a50e1..8f455076c 100644
--- a/src/Psalm/Codebase/ClassLikes.php
+++ b/src/Psalm/Internal/Codebase/ClassLikes.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 use PhpParser;
 use Psalm\Aliases;
diff --git a/src/Psalm/Codebase/Functions.php b/src/Psalm/Internal/Codebase/Functions.php
similarity index 99%
rename from src/Psalm/Codebase/Functions.php
rename to src/Psalm/Internal/Codebase/Functions.php
index 6a591e51a..e922ac928 100644
--- a/src/Psalm/Codebase/Functions.php
+++ b/src/Psalm/Internal/Codebase/Functions.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 use Psalm\Codebase;
 use Psalm\Internal\Analyzer\ProjectAnalyzer;
diff --git a/src/Psalm/Codebase/Methods.php b/src/Psalm/Internal/Codebase/Methods.php
similarity index 99%
rename from src/Psalm/Codebase/Methods.php
rename to src/Psalm/Internal/Codebase/Methods.php
index 4d354b512..fe705af86 100644
--- a/src/Psalm/Codebase/Methods.php
+++ b/src/Psalm/Internal/Codebase/Methods.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 use PhpParser;
 use Psalm\Internal\Analyzer\MethodAnalyzer;
diff --git a/src/Psalm/Codebase/Populator.php b/src/Psalm/Internal/Codebase/Populator.php
similarity index 99%
rename from src/Psalm/Codebase/Populator.php
rename to src/Psalm/Internal/Codebase/Populator.php
index 65a388e21..e6a3bc671 100644
--- a/src/Psalm/Codebase/Populator.php
+++ b/src/Psalm/Internal/Codebase/Populator.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 use Psalm\Internal\Analyzer\ClassLikeAnalyzer;
 use Psalm\Config;
diff --git a/src/Psalm/Codebase/Properties.php b/src/Psalm/Internal/Codebase/Properties.php
similarity index 99%
rename from src/Psalm/Codebase/Properties.php
rename to src/Psalm/Internal/Codebase/Properties.php
index 0b9ecc8ab..eb370393d 100644
--- a/src/Psalm/Codebase/Properties.php
+++ b/src/Psalm/Internal/Codebase/Properties.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 use Psalm\CodeLocation;
 use Psalm\Internal\Provider\ClassLikeStorageProvider;
diff --git a/src/Psalm/Codebase/PropertyMap.php b/src/Psalm/Internal/Codebase/PropertyMap.php
similarity index 90%
rename from src/Psalm/Codebase/PropertyMap.php
rename to src/Psalm/Internal/Codebase/PropertyMap.php
index ccf029814..7941d84fc 100644
--- a/src/Psalm/Codebase/PropertyMap.php
+++ b/src/Psalm/Internal/Codebase/PropertyMap.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 class PropertyMap
 {
@@ -22,7 +22,7 @@ class PropertyMap
         }
 
         /** @var array<string, array<string, string>> */
-        $property_map = require_once(__DIR__ . '/../Internal/PropertyMap.php');
+        $property_map = require_once(__DIR__ . '/../PropertyMap.php');
 
         self::$property_map = [];
 
diff --git a/src/Psalm/Codebase/Reflection.php b/src/Psalm/Internal/Codebase/Reflection.php
similarity index 99%
rename from src/Psalm/Codebase/Reflection.php
rename to src/Psalm/Internal/Codebase/Reflection.php
index c9a790de8..a21d5488c 100644
--- a/src/Psalm/Codebase/Reflection.php
+++ b/src/Psalm/Internal/Codebase/Reflection.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 use Psalm\Internal\Analyzer\ClassLikeAnalyzer;
 use Psalm\Internal\Analyzer\CommentAnalyzer;
diff --git a/src/Psalm/Codebase/Scanner.php b/src/Psalm/Internal/Codebase/Scanner.php
similarity index 99%
rename from src/Psalm/Codebase/Scanner.php
rename to src/Psalm/Internal/Codebase/Scanner.php
index 5d203ca99..496f148ce 100644
--- a/src/Psalm/Codebase/Scanner.php
+++ b/src/Psalm/Internal/Codebase/Scanner.php
@@ -1,5 +1,5 @@
 <?php
-namespace Psalm\Codebase;
+namespace Psalm\Internal\Codebase;
 
 use Psalm\Codebase;
 use Psalm\Config;
diff --git a/src/Psalm/FileManipulation/FileManipulationBuffer.php b/src/Psalm/Internal/FileManipulation/FileManipulationBuffer.php
similarity index 93%
rename from src/Psalm/FileManipulation/FileManipulationBuffer.php
rename to src/Psalm/Internal/FileManipulation/FileManipulationBuffer.php
index fd099b12b..c1b7b0288 100644
--- a/src/Psalm/FileManipulation/FileManipulationBuffer.php
+++ b/src/Psalm/Internal/FileManipulation/FileManipulationBuffer.php
@@ -1,5 +1,7 @@
 <?php
-namespace Psalm\FileManipulation;
+namespace Psalm\Internal\FileManipulation;
+
+use Psalm\FileManipulation;
 
 class FileManipulationBuffer
 {
diff --git a/src/Psalm/FileManipulation/FunctionDocblockManipulator.php b/src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php
similarity index 99%
rename from src/Psalm/FileManipulation/FunctionDocblockManipulator.php
rename to src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php
index 92423b03f..278f0bc1f 100644
--- a/src/Psalm/FileManipulation/FunctionDocblockManipulator.php
+++ b/src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php
@@ -1,5 +1,7 @@
 <?php
-namespace Psalm\FileManipulation;
+namespace Psalm\Internal\FileManipulation;
+
+use Psalm\FileManipulation;
 
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\FunctionLike;
diff --git a/src/Psalm/Internal/Visitor/DependencyFinderVisitor.php b/src/Psalm/Internal/Visitor/DependencyFinderVisitor.php
index 38febc219..ac915e583 100644
--- a/src/Psalm/Internal/Visitor/DependencyFinderVisitor.php
+++ b/src/Psalm/Internal/Visitor/DependencyFinderVisitor.php
@@ -10,8 +10,8 @@ use Psalm\Internal\Analyzer\Statements\Expression\CallAnalyzer;
 use Psalm\Internal\Analyzer\Statements\Expression\IncludeAnalyzer;
 use Psalm\Internal\Analyzer\StatementsAnalyzer;
 use Psalm\Codebase;
-use Psalm\Codebase\CallMap;
-use Psalm\Codebase\PropertyMap;
+use Psalm\Internal\Codebase\CallMap;
+use Psalm\Internal\Codebase\PropertyMap;
 use Psalm\CodeLocation;
 use Psalm\Config;
 use Psalm\DocComment;
diff --git a/src/Psalm/Plugin/Hook/AfterClassLikeExistenceCheckInterface.php b/src/Psalm/Plugin/Hook/AfterClassLikeExistenceCheckInterface.php
index abb617667..fc199ba7b 100644
--- a/src/Psalm/Plugin/Hook/AfterClassLikeExistenceCheckInterface.php
+++ b/src/Psalm/Plugin/Hook/AfterClassLikeExistenceCheckInterface.php
@@ -3,7 +3,7 @@ namespace Psalm\Plugin\Hook;
 
 use Psalm\CodeLocation;
 use Psalm\Codebase;
-use Psalm\FileManipulation\FileManipulation;
+use Psalm\FileManipulation;
 use Psalm\StatementsSource;
 
 interface AfterClassLikeExistenceCheckInterface
diff --git a/src/Psalm/Plugin/Hook/AfterClassLikeVisitInterface.php b/src/Psalm/Plugin/Hook/AfterClassLikeVisitInterface.php
index 2ddc4c978..a17ceecb1 100644
--- a/src/Psalm/Plugin/Hook/AfterClassLikeVisitInterface.php
+++ b/src/Psalm/Plugin/Hook/AfterClassLikeVisitInterface.php
@@ -3,7 +3,7 @@ namespace Psalm\Plugin\Hook;
 
 use PhpParser\Node\Stmt\ClassLike;
 use Psalm\Codebase;
-use Psalm\FileManipulation\FileManipulation;
+use Psalm\FileManipulation;
 use Psalm\StatementsSource;
 use Psalm\Storage\ClassLikeStorage;
 
diff --git a/src/Psalm/Plugin/Hook/AfterExpressionAnalysisInterface.php b/src/Psalm/Plugin/Hook/AfterExpressionAnalysisInterface.php
index 8a8d076df..33edf03d2 100644
--- a/src/Psalm/Plugin/Hook/AfterExpressionAnalysisInterface.php
+++ b/src/Psalm/Plugin/Hook/AfterExpressionAnalysisInterface.php
@@ -4,7 +4,7 @@ namespace Psalm\Plugin\Hook;
 use PhpParser\Node\Expr;
 use Psalm\Codebase;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulation;
+use Psalm\FileManipulation;
 use Psalm\StatementsSource;
 
 interface AfterExpressionAnalysisInterface
diff --git a/src/Psalm/Plugin/Hook/AfterFunctionCallAnalysisInterface.php b/src/Psalm/Plugin/Hook/AfterFunctionCallAnalysisInterface.php
index 56ee83d82..b7b7e3c7b 100644
--- a/src/Psalm/Plugin/Hook/AfterFunctionCallAnalysisInterface.php
+++ b/src/Psalm/Plugin/Hook/AfterFunctionCallAnalysisInterface.php
@@ -4,7 +4,7 @@ namespace Psalm\Plugin\Hook;
 use PhpParser\Node\Expr\FuncCall;
 use Psalm\Codebase;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulation;
+use Psalm\FileManipulation;
 use Psalm\StatementsSource;
 use Psalm\Type\Union;
 
diff --git a/src/Psalm/Plugin/Hook/AfterMethodCallAnalysisInterface.php b/src/Psalm/Plugin/Hook/AfterMethodCallAnalysisInterface.php
index 57ba1d5c7..48d4acb19 100644
--- a/src/Psalm/Plugin/Hook/AfterMethodCallAnalysisInterface.php
+++ b/src/Psalm/Plugin/Hook/AfterMethodCallAnalysisInterface.php
@@ -6,7 +6,7 @@ use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use Psalm\Codebase;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulation;
+use Psalm\FileManipulation;
 use Psalm\StatementsSource;
 use Psalm\Type\Union;
 
diff --git a/src/Psalm/Plugin/Hook/AfterStatementAnalysisInterface.php b/src/Psalm/Plugin/Hook/AfterStatementAnalysisInterface.php
index 837df1cf3..ca5e80ee0 100644
--- a/src/Psalm/Plugin/Hook/AfterStatementAnalysisInterface.php
+++ b/src/Psalm/Plugin/Hook/AfterStatementAnalysisInterface.php
@@ -4,7 +4,7 @@ namespace Psalm\Plugin\Hook;
 use PhpParser\Node\Stmt;
 use Psalm\Codebase;
 use Psalm\Context;
-use Psalm\FileManipulation\FileManipulation;
+use Psalm\FileManipulation;
 use Psalm\StatementsSource;
 
 interface AfterStatementAnalysisInterface
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 18de0cb46..733cb6b75 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -238,7 +238,6 @@ class ConfigTest extends TestCase
                         <directory name="src" />
                         <directory name="examples" />
                         <ignoreFiles>
-                            <file name="**/**/**/*Analyzer.php" />
                             <file name="**/**/**/**/*Analyzer.php" />
                             <file name="**/**/**/**/**/*Analyzer.php" />
                         </ignoreFiles>
diff --git a/tests/DocumentationTest.php b/tests/DocumentationTest.php
index 2c51d328f..722c5b5d7 100644
--- a/tests/DocumentationTest.php
+++ b/tests/DocumentationTest.php
@@ -64,7 +64,7 @@ class DocumentationTest extends TestCase
     public function setUp()
     {
         FileAnalyzer::clearCache();
-        \Psalm\FileManipulation\FunctionDocblockManipulator::clearCache();
+        \Psalm\Internal\FileManipulation\FunctionDocblockManipulator::clearCache();
 
         $this->file_provider = new Provider\FakeFileProvider();
 
diff --git a/tests/FileManipulationTest.php b/tests/FileManipulationTest.php
index d8f9e3c9d..23dbd1ad7 100644
--- a/tests/FileManipulationTest.php
+++ b/tests/FileManipulationTest.php
@@ -15,7 +15,7 @@ class FileManipulationTest extends TestCase
     public function setUp()
     {
         FileAnalyzer::clearCache();
-        \Psalm\FileManipulation\FunctionDocblockManipulator::clearCache();
+        \Psalm\Internal\FileManipulation\FunctionDocblockManipulator::clearCache();
 
         $this->file_provider = new Provider\FakeFileProvider();
     }
diff --git a/tests/FileReferenceTest.php b/tests/FileReferenceTest.php
index 810b70f0e..9db3ff966 100644
--- a/tests/FileReferenceTest.php
+++ b/tests/FileReferenceTest.php
@@ -15,7 +15,7 @@ class FileReferenceTest extends TestCase
     public function setUp()
     {
         FileAnalyzer::clearCache();
-        \Psalm\FileManipulation\FunctionDocblockManipulator::clearCache();
+        \Psalm\Internal\FileManipulation\FunctionDocblockManipulator::clearCache();
 
         $this->file_provider = new Provider\FakeFileProvider();
 
diff --git a/tests/TypeParseTest.php b/tests/TypeParseTest.php
index 62df13ae7..ac0fa193b 100644
--- a/tests/TypeParseTest.php
+++ b/tests/TypeParseTest.php
@@ -731,6 +731,6 @@ class TypeParseTest extends TestCase
      */
     public function providerTestValidCallMapType()
     {
-        return \Psalm\Codebase\CallMap::getCallMap();
+        return \Psalm\Internal\Codebase\CallMap::getCallMap();
     }
 }