diff --git a/CLAUDE.md b/CLAUDE.md
index 36ea56df..117ae0e7 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -79,12 +79,12 @@ src/CompilerBase.php (core PHP→C++ translation logic, indent/output/mode helpe
 | `src/Context/` | `ScopeContext` and `FunctionContext` for variable scoping and type tracking |
 | `src/Exception/` | `SyntaxError`, `Unsupported`, `DynamicCall`, `PlaceHolder`, `Skip`, `Redo`, `TestError` |
 | `src/Parser/` | Special-purpose parsers like `StdContainerParser` (C++ std container foreach support) |
-| `src/Reflection.php` | Static helpers wrapping PHP reflection (internal class/function detection) |
-| `src/Symbol.php` | Maps PHP operations to `phpx` C++ API symbol names |
-| `src/FileScanner.php` | Recursive file discovery with extension filtering (supports `.php`, `.cpp`, `.c`, `.s`, `.m`, `.mm`) |
-| `src/ArgInfo.php` | Generates C function argument info structures for internal function registration |
+| `src/Resolver/Reflection.php` | Static helpers wrapping PHP reflection (internal class/function detection) |
+| `src/Generator/Symbol.php` | Maps PHP operations to `phpx` C++ API symbol names |
+| `src/Build/FileScanner.php` | Recursive file discovery with extension filtering (supports `.php`, `.cpp`, `.c`, `.s`, `.m`, `.mm`) |
+| `src/Entity/ArgInfo.php` | Generates C function argument info structures for internal function registration |
 | `src/Extractor.php` | Extracts interfaces from PHP classes |
-| `src/Visitor.php` | Base `NodeVisitorAbstract` extension (skeleton for custom AST visitors) |
+| `src/Transform/Visitor.php` | Base `NodeVisitorAbstract` extension (skeleton for custom AST visitors) |
 
 ### Configuration
 
diff --git a/docs/UNIVERSAL_METHODS.md b/docs/UNIVERSAL_METHODS.md
index 52e609b2..59f1b7dc 100644
--- a/docs/UNIVERSAL_METHODS.md
+++ b/docs/UNIVERSAL_METHODS.md
@@ -1103,7 +1103,7 @@ function main(): void {
 
 - **高精度类型教程**：[`docs/HIGH_PRECISION_TYPES.md`](HIGH_PRECISION_TYPES.md)
 - **类型系统规范**：[`docs/NATIVE_TYPES.md`](NATIVE_TYPES.md)
-- **通用方法实现**：[`src/UniversalMethodCall.php`](../src/UniversalMethodCall.php)
+- **通用方法实现**：[`src/Parser/UniversalMethodCall.php`](../src/Parser/UniversalMethodCall.php)
 - **集成测试**：
   - [`tests/aot/string_method/`](../tests/aot/string_method/) — String 通用方法测试
   - [`tests/aot/array_method/`](../tests/aot/array_method/) — Array 通用方法测试
diff --git a/examples/file_scanner_example.php b/examples/file_scanner_example.php
index c1efc491..d6970063 100644
--- a/examples/file_scanner_example.php
+++ b/examples/file_scanner_example.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../src/FileScanner.php';
+require_once __DIR__ . '/../src/Build/FileScanner.php';
+
+use TypePhp\Build\FileScanner;
 
 // 创建文件扫描器实例，用于扫描 PHP 和 C++ 文件
 $scanner = new FileScanner(['.php', '.cc', '.cpp', '.cxx', '.c', '.h', '.hpp']);
@@ -34,4 +36,4 @@ try {
     
 } catch (Exception $e) {
     echo "错误: " . $e->getMessage() . "\n";
-}
\ No newline at end of file
+}
diff --git a/examples/file_scanner_usage.php b/examples/file_scanner_usage.php
index 1e5543f3..401777bc 100644
--- a/examples/file_scanner_usage.php
+++ b/examples/file_scanner_usage.php
@@ -1,9 +1,9 @@
 <?php
 
 require_once __DIR__ . '/../vendor/autoload.php'; // 添加自动加载器
-require_once __DIR__ . '/../src/Php/FileScanner.php';
+require_once __DIR__ . '/../src/Build/FileScanner.php';
 
-use PhpAot\FileScanner;
+use TypePhp\Build\FileScanner;
 
 echo "测试 FileScanner 类...\n";
 
diff --git a/examples/scan_with_exclusions.php b/examples/scan_with_exclusions.php
index c6821d13..997b65c0 100644
--- a/examples/scan_with_exclusions.php
+++ b/examples/scan_with_exclusions.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../src/FileScanner.php';
+require_once __DIR__ . '/../src/Build/FileScanner.php';
+
+use TypePhp\Build\FileScanner;
 
 // 创建文件扫描器实例，用于扫描 PHP 和 C++ 文件
 $scanner = new FileScanner(['.php', '.cc', '.cpp', '.cxx', '.c', '.h', '.hpp']);
@@ -39,4 +41,4 @@ try {
     
 } catch (Exception $e) {
     echo "错误: " . $e->getMessage() . "\n";
-}
\ No newline at end of file
+}
diff --git a/examples/simple_scan.php b/examples/simple_scan.php
index b4c5097a..4e124ffc 100644
--- a/examples/simple_scan.php
+++ b/examples/simple_scan.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../src/FileScanner.php';
+require_once __DIR__ . '/../src/Build/FileScanner.php';
+
+use TypePhp\Build\FileScanner;
 
 // 创建文件扫描器实例，用于扫描 PHP 和 C++ 文件
 $scanner = new FileScanner(['.php', '.cc', '.cpp', '.cxx', '.c', '.h', '.hpp']);
@@ -35,4 +37,4 @@ try {
     
 } catch (Exception $e) {
     echo "错误: " . $e->getMessage() . "\n";
-}
\ No newline at end of file
+}
diff --git a/examples/test_exclusions.php b/examples/test_exclusions.php
index f4d1f979..ccfc38ed 100644
--- a/examples/test_exclusions.php
+++ b/examples/test_exclusions.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../src/Php/FileScanner.php';
+require_once __DIR__ . '/../src/Build/FileScanner.php';
 
-use PhpAot\FileScanner;
+use TypePhp\Build\FileScanner;
 
 echo "测试基本扫描功能...\n";
 $scanner = new FileScanner(__DIR__ . '/..', ['.php', '.cc', '.cpp', '.cxx', '.c', '.h', '.hpp']);
diff --git a/examples/test_php_parser_check.php b/examples/test_php_parser_check.php
index c27abf70..f2f8b782 100644
--- a/examples/test_php_parser_check.php
+++ b/examples/test_php_parser_check.php
@@ -1,9 +1,9 @@
 <?php
 
 require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../src/Php/FileScanner.php';
+require_once __DIR__ . '/../src/Build/FileScanner.php';
 
-use PhpAot\FileScanner;
+use TypePhp\Build\FileScanner;
 
 echo "测试使用 PHP-Parser 的语法检查功能...\n";
 
diff --git a/examples/test_php_syntax_check.php b/examples/test_php_syntax_check.php
index deb54b46..fb99c8da 100644
--- a/examples/test_php_syntax_check.php
+++ b/examples/test_php_syntax_check.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../src/Php/FileScanner.php';
+require_once __DIR__ . '/../src/Build/FileScanner.php';
 
-use PhpAot\FileScanner;
+use TypePhp\Build\FileScanner;
 
 echo "测试 PHP 语法检查功能...\n";
 
diff --git a/src/CompilerBase.php b/src/CompilerBase.php
index 32f445bf..e938a39e 100644
--- a/src/CompilerBase.php
+++ b/src/CompilerBase.php
@@ -12,6 +12,7 @@ use League\CLImate\CLImate;
 use TypePhp\Backend\CompilerBackend;
 use TypePhp\Backend\CompilerFactory;
 use TypePhp\Build\NativeBuildConfigurationTrait;
+use TypePhp\Entity\ArgInfo;
 use TypePhp\Context\FunctionContext;
 use TypePhp\Context\CompilationStateTrait;
 use TypePhp\Entity\ClassDef;
@@ -30,6 +31,7 @@ use TypePhp\Generator\ClosureGenerator;
 use TypePhp\Generator\FiberGenerator;
 use TypePhp\Generator\PlaceHolderGenerator;
 use TypePhp\Generator\PropertyPromotion;
+use TypePhp\Generator\Symbol;
 use TypePhp\Generator\Utils;
 use TypePhp\Generator\TypeCheckGenerator;
 use TypePhp\Optimizer\SsaPropOptimizer;
@@ -38,6 +40,7 @@ use TypePhp\Optimizer\LoopVarOptimizer;
 use TypePhp\Parser\StdContainerTrait;
 use TypePhp\Parser\AssignOpTrait;
 use TypePhp\Parser\ArrayExpressionTrait;
+use TypePhp\Parser\AstNodeType;
 use TypePhp\Parser\BinaryOpTrait;
 use TypePhp\Parser\ClassConstantFetchTrait;
 use TypePhp\Parser\ConditionalControlTrait;
@@ -53,6 +56,7 @@ use TypePhp\Parser\SelectionExpressionTrait;
 use TypePhp\Parser\SwitchTrait;
 use TypePhp\Parser\TypeConversionTrait;
 use TypePhp\Parser\TypeDetectionTrait;
+use TypePhp\Parser\UniversalMethodCall;
 use TypePhp\Optimizer\FuncCallOptimizer;
 use TypePhp\Platform\Linux;
 use TypePhp\Platform\Macos;
@@ -61,6 +65,7 @@ use TypePhp\Platform\PlatformFactory;
 use TypePhp\Platform\Windows;
 use TypePhp\Resolver\InstancePropertyFetchTarget;
 use TypePhp\Resolver\DeclarationSymbolTrait;
+use TypePhp\Resolver\MagicMethodDetector;
 use TypePhp\Resolver\PropertyAccessContext;
 use TypePhp\Resolver\NativePropertyAccess;
 use TypePhp\Resolver\NameResolutionTrait;
@@ -68,6 +73,7 @@ use TypePhp\Resolver\PropertyAccessResult;
 use TypePhp\Resolver\PropertyAccessResolver;
 use TypePhp\Resolver\PropertyAssignTypeInfo;
 use TypePhp\Resolver\PropertyWriteTarget;
+use TypePhp\Resolver\Reflection;
 use TypePhp\Resolver\StaticPropertyFetchResolution;
 use TypePhp\Resolver\StaticPropertyFetchTarget;
 use TypePhp\TypeSystem\CompositeTypeCheckerTrait;
diff --git a/src/Generator/Symbol.php b/src/Generator/Symbol.php
index 71056afd..e80ae4d7 100644
--- a/src/Generator/Symbol.php
+++ b/src/Generator/Symbol.php
@@ -8,6 +8,8 @@
 
 namespace TypePhp\Generator;
 
+use TypePhp\CompilerBase;
+
 class Symbol
 {
     public static function getStaticProperty(): string
diff --git a/src/Metadata/Constants.php b/src/Metadata/Constants.php
index c3756bd0..019fc076 100644
--- a/src/Metadata/Constants.php
+++ b/src/Metadata/Constants.php
@@ -8,6 +8,8 @@
 
 namespace TypePhp\Metadata;
 
+use TypePhp\CompilerBase;
+
 class Constants
 {
     public const array CPP_RESERVED_NAMES = [
diff --git a/src/Parser/UniversalMethodCall.php b/src/Parser/UniversalMethodCall.php
index f5f89408..e7252a4d 100644
--- a/src/Parser/UniversalMethodCall.php
+++ b/src/Parser/UniversalMethodCall.php
@@ -2,6 +2,7 @@
 
 namespace TypePhp\Parser;
 
+use TypePhp\CompilerBase;
 use TypePhp\Resolver\Reflection;
 
 use PhpParser\Node;
diff --git a/src/Preprocessor.php b/src/Preprocessor.php
index 1d028999..e1cd06a2 100644
--- a/src/Preprocessor.php
+++ b/src/Preprocessor.php
@@ -9,6 +9,7 @@
 namespace TypePhp;
 
 use MJS\TopSort\Implementations\StringSort;
+use TypePhp\Entity\ArgInfo;
 use TypePhp\Entity\ArrayInitPlan;
 use TypePhp\Entity\ClassDef;
 use TypePhp\Entity\ConstantDef;
@@ -17,6 +18,8 @@ use TypePhp\Entity\InterfaceDef;
 use TypePhp\Entity\MethodDef;
 use TypePhp\Entity\PropertyDef;
 use TypePhp\Exception\SyntaxError;
+use TypePhp\Transform\PropertyHookLowering;
+use TypePhp\Transform\Visitor;
 use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\IntersectionType;
diff --git a/src/Translator.php b/src/Translator.php
index 97c5ded8..88ae06fd 100644
--- a/src/Translator.php
+++ b/src/Translator.php
@@ -11,6 +11,8 @@ namespace TypePhp;
 use MJS\TopSort\Implementations\StringSort;
 use TypePhp\Analysis\SsaBuilder;
 use TypePhp\Backend\CompilerFactory;
+use TypePhp\Build\FileScanner;
+use TypePhp\Entity\ArgInfo;
 use TypePhp\Entity\ClassDef;
 use TypePhp\Entity\ClassLikeDef;
 use TypePhp\Entity\ConstantDef;
@@ -24,8 +26,12 @@ use TypePhp\Exception\SyntaxError;
 use TypePhp\Exception\Unsupported;
 use TypePhp\Generator\ResourceFileGenerator;
 use TypePhp\Generator\DefaultArgumentGenerator;
+use TypePhp\Generator\Symbol;
+use TypePhp\Metadata\Constants;
 use TypePhp\Platform\PlatformFactory;
 use TypePhp\Platform\Windows;
+use TypePhp\Resolver\Reflection;
+use TypePhp\Transform\Visitor;
 use PhpParser\Modifiers;
 use PhpParser\Node;
 use PhpParser\Node\ArrayItem;