diff --git a/.gitattributes b/.gitattributes
index df67963ab..700a7ff8f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 tests/ export-ignore
+tools/ export-ignore
 extracted.json export-ignore
 README.md export-ignore
 CHANGELOG.md export-ignore
diff --git a/composer.json b/composer.json
index cf2966ad2..7d3b44d8f 100644
--- a/composer.json
+++ b/composer.json
@@ -99,7 +99,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "danog\\MadelineProto\\Test\\": "tests/danog/MadelineProto"
+            "danog\\MadelineProto\\Test\\": "tests/danog/MadelineProto",
+            "danog\\MadelineProto\\": "tools/"
         },
         "files": [
             "tools/build_docs/schemas.php",
diff --git a/psalm.xml b/psalm.xml
index f23ff629e..ee9a55fd8 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -15,9 +15,6 @@
         <directory name="src" />
         <ignoreFiles>
             <directory name="vendor" />
-            <file name="src/DocsBuilder.php" />
-            <file name="src/DocsBuilder/Methods.php" />
-            <file name="src/DocsBuilder/Constructors.php" />
             <!-- FFI psalm bug -->
             <file name="src/Ogg.php" />
         </ignoreFiles>
diff --git a/schemas b/schemas
index 5bf936239..c23c18b72 160000
--- a/schemas
+++ b/schemas
@@ -1 +1 @@
-Subproject commit 5bf936239e21cb2e2c028a828bff7c3b75be9995
+Subproject commit c23c18b720a3b705069bb0ce947d65898bd9f397
diff --git a/src/AnnotationsBuilder.php b/tools/AnnotationsBuilder.php
similarity index 99%
rename from src/AnnotationsBuilder.php
rename to tools/AnnotationsBuilder.php
index b674a9bf4..9368d18a6 100644
--- a/src/AnnotationsBuilder.php
+++ b/tools/AnnotationsBuilder.php
@@ -63,7 +63,7 @@ final class AnnotationsBuilder
         $this->blacklistHard = $this->blacklist;
         unset($this->blacklistHard['messages.getHistory'], $this->blacklistHard['channels.getMessages'], $this->blacklistHard['messages.getMessages'], $this->blacklistHard['updates.getDifference'], $this->blacklistHard['updates.getChannelDifference'], $this->blacklistHard['updates.getState']);
 
-        file_put_contents(__DIR__.'/Namespace/Blacklist.php', '<?php
+        file_put_contents(__DIR__.'/../src/Namespace/Blacklist.php', '<?php
 namespace danog\MadelineProto\Namespace;
 
 final class Blacklist {
@@ -557,7 +557,7 @@ final class Blacklist {
         }
         foreach ($internalDoc as $namespace => $methods) {
             if ($namespace === 'InternalDoc') {
-                $handle = fopen(__DIR__.'/InternalDoc.php', 'w');
+                $handle = fopen(__DIR__.'/../src/InternalDoc.php', 'w');
                 fwrite($handle, "<?php\n");
                 fwrite($handle, "/**\n");
                 fwrite($handle, " * This file is automatically generated by the build_docs.php file\n");
@@ -618,7 +618,7 @@ final class Blacklist {
                 fwrite($handle, "}\n");
             } else {
                 $namespace = ucfirst($namespace);
-                $handle = fopen(__DIR__."/Namespace/$namespace.php", 'w');
+                $handle = fopen(__DIR__."/../src/Namespace/$namespace.php", 'w');
                 fwrite($handle, "<?php\n");
                 fwrite($handle, "/**\n");
                 fwrite($handle, " * This file is automatic generated by build_docs.php file\n");
@@ -636,7 +636,7 @@ final class Blacklist {
         }
         fclose($handle);
 
-        $handle = fopen(__DIR__.'/EventHandler/SimpleFilters.php', 'w');
+        $handle = fopen(__DIR__.'/../src/EventHandler/SimpleFilters.php', 'w');
         fwrite($handle, "<?php\n");
         fwrite($handle, "/**\n");
         fwrite($handle, " * This file is automatically generated by the build_docs.php file\n");
diff --git a/src/DocsBuilder.php b/tools/DocsBuilder.php
similarity index 100%
rename from src/DocsBuilder.php
rename to tools/DocsBuilder.php
diff --git a/src/DocsBuilder/Constructors.php b/tools/DocsBuilder/Constructors.php
similarity index 100%
rename from src/DocsBuilder/Constructors.php
rename to tools/DocsBuilder/Constructors.php
diff --git a/src/DocsBuilder/Methods.php b/tools/DocsBuilder/Methods.php
similarity index 100%
rename from src/DocsBuilder/Methods.php
rename to tools/DocsBuilder/Methods.php