diff --git a/ASTPlayground/ASTPlayground.dpr b/ASTPlayground/ASTPlayground.dpr
index 1918d00..c9dc79e 100644
--- a/ASTPlayground/ASTPlayground.dpr
+++ b/ASTPlayground/ASTPlayground.dpr
@@ -26,11 +26,11 @@ uses
     Myc.Ast.Debugger in '..\Src\AST\Myc.Ast.Debugger.pas',
     Myc.Ast.Analysis.Purity in '..\Src\AST\Myc.Ast.Analysis.Purity.pas',
     Myc.Ast.Identities in '..\Src\AST\Myc.Ast.Identities.pas',
-    Myc.Fmx.AstEditor.Core in '..\Src\AST\Myc.Fmx.AstEditor.Core.pas',
     Myc.Fmx.AstEditor.Handlers in '..\Src\AST\Myc.Fmx.AstEditor.Handlers.pas',
     Myc.Fmx.AstEditor.Visualizer in '..\Src\AST\Myc.Fmx.AstEditor.Visualizer.pas',
     Myc.Fmx.AstEditor.Workspace in '..\Src\AST\Myc.Fmx.AstEditor.Workspace.pas',
-    Myc.Fmx.AstEditor.Controller in '..\Src\AST\Myc.Fmx.AstEditor.Controller.pas';
+    Myc.Fmx.AstEditor.Controller in '..\Src\AST\Myc.Fmx.AstEditor.Controller.pas',
+    Myc.Fmx.AstEditor in '..\Src\AST\Myc.Fmx.AstEditor.pas';
 
 {$R *.res}
 
diff --git a/ASTPlayground/ASTPlayground.dproj b/ASTPlayground/ASTPlayground.dproj
index bef716e..dbfe0b7 100644
--- a/ASTPlayground/ASTPlayground.dproj
+++ b/ASTPlayground/ASTPlayground.dproj
@@ -156,11 +156,11 @@
         <DCCReference Include="..\Src\AST\Myc.Ast.Debugger.pas"/>
         <DCCReference Include="..\Src\AST\Myc.Ast.Analysis.Purity.pas"/>
         <DCCReference Include="..\Src\AST\Myc.Ast.Identities.pas"/>
-        <DCCReference Include="..\Src\AST\Myc.Fmx.AstEditor.Core.pas"/>
         <DCCReference Include="..\Src\AST\Myc.Fmx.AstEditor.Handlers.pas"/>
         <DCCReference Include="..\Src\AST\Myc.Fmx.AstEditor.Visualizer.pas"/>
         <DCCReference Include="..\Src\AST\Myc.Fmx.AstEditor.Workspace.pas"/>
         <DCCReference Include="..\Src\AST\Myc.Fmx.AstEditor.Controller.pas"/>
+        <DCCReference Include="..\Src\AST\Myc.Fmx.AstEditor.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
diff --git a/ASTPlayground/MainForm.pas b/ASTPlayground/MainForm.pas
index 1010e21..e32cb62 100644
--- a/ASTPlayground/MainForm.pas
+++ b/ASTPlayground/MainForm.pas
@@ -44,7 +44,7 @@ uses
     Myc.Ast.RTL,
     Myc.Ast.Compiler.Macros,
     // Editor Units
-    Myc.Fmx.AstEditor.Core,
+    Myc.Fmx.AstEditor,
     Myc.Fmx.AstEditor.Workspace,
     Myc.Fmx.AstEditor.Controller; // Controller integration
 
diff --git a/Src/AST/Myc.Fmx.AstEditor.Controller.pas b/Src/AST/Myc.Fmx.AstEditor.Controller.pas
index 58f769f..9c8ae2e 100644
--- a/Src/AST/Myc.Fmx.AstEditor.Controller.pas
+++ b/Src/AST/Myc.Fmx.AstEditor.Controller.pas
@@ -15,7 +15,7 @@ uses
     Myc.Ast.Visitor,
     Myc.Ast.Scope,
     Myc.Ast.Environment,
-    Myc.Fmx.AstEditor.Core,
+    Myc.Fmx.AstEditor,
     Myc.Fmx.AstEditor.Workspace;
 
 type
diff --git a/Src/AST/Myc.Fmx.AstEditor.Handlers.pas b/Src/AST/Myc.Fmx.AstEditor.Handlers.pas
index 2e5cde9..df973b0 100644
--- a/Src/AST/Myc.Fmx.AstEditor.Handlers.pas
+++ b/Src/AST/Myc.Fmx.AstEditor.Handlers.pas
@@ -17,7 +17,7 @@ uses
     Myc.Ast,
     Myc.Ast.Nodes,
     Myc.Ast.Identities,
-    Myc.Fmx.AstEditor.Core;
+    Myc.Fmx.AstEditor;
 
 type
     // --- Abstract List Base ---
diff --git a/Src/AST/Myc.Fmx.AstEditor.Visualizer.pas b/Src/AST/Myc.Fmx.AstEditor.Visualizer.pas
index 57e879f..4f5cd3e 100644
--- a/Src/AST/Myc.Fmx.AstEditor.Visualizer.pas
+++ b/Src/AST/Myc.Fmx.AstEditor.Visualizer.pas
@@ -10,7 +10,7 @@ uses
     Myc.Ast.Nodes,
     Myc.Ast.Visitor,
     Myc.Fmx.AstEditor.Workspace,
-    Myc.Fmx.AstEditor.Core,
+    Myc.Fmx.AstEditor,
     Myc.Fmx.AstEditor.Handlers;
 
 type
diff --git a/Src/AST/Myc.Fmx.AstEditor.Workspace.pas b/Src/AST/Myc.Fmx.AstEditor.Workspace.pas
index d29ce50..e1c4068 100644
--- a/Src/AST/Myc.Fmx.AstEditor.Workspace.pas
+++ b/Src/AST/Myc.Fmx.AstEditor.Workspace.pas
@@ -93,7 +93,7 @@ implementation
 uses
     System.Math,
     FMX.Platform,
-    Myc.Fmx.AstEditor.Core,
+    Myc.Fmx.AstEditor,
     Myc.Fmx.AstEditor.Visualizer;
 
 { TPinConnection }
diff --git a/Src/AST/Myc.Fmx.AstEditor.Core.pas b/Src/AST/Myc.Fmx.AstEditor.pas
similarity index 96%
rename from Src/AST/Myc.Fmx.AstEditor.Core.pas
rename to Src/AST/Myc.Fmx.AstEditor.pas
index 263197a..4eddf6a 100644
--- a/Src/AST/Myc.Fmx.AstEditor.Core.pas
+++ b/Src/AST/Myc.Fmx.AstEditor.pas
@@ -1,4 +1,4 @@
-unit Myc.Fmx.AstEditor.Core;
+unit Myc.Fmx.AstEditor;
 
 interface