diff --git a/build/Stride.slnx b/build/Stride.slnx
index f9f8d5631..eb464755e 100644
--- a/build/Stride.slnx
+++ b/build/Stride.slnx
@@ -159,8 +159,8 @@
     <Project Path="../sources/presentation/Stride.Core.Presentation.Avalonia/Stride.Core.Presentation.Avalonia.csproj" />
   </Folder>
   <Folder Name="/50-Presentation/Wpf/">
-    <Project Path="../sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Wpf.Graph.csproj" />
     <Project Path="../sources/presentation/Stride.Core.Presentation.Wpf.Dialogs/Stride.Core.Presentation.Wpf.Dialogs.csproj" />
+    <Project Path="../sources/presentation/Stride.Core.Presentation.Wpf.Graph/Stride.Core.Presentation.Wpf.Graph.csproj" />
     <Project Path="../sources/presentation/Stride.Core.Presentation.Wpf/Stride.Core.Presentation.Wpf.csproj" />
     <Project Path="../sources/presentation/Stride.Core.Translation.Presentation/Stride.Core.Translation.Presentation.Wpf.csproj" />
   </Folder>
diff --git a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.Wpf.csproj b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.Wpf.csproj
index b69b3c1b6..4815dd3f0 100644
--- a/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.Wpf.csproj
+++ b/sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.Wpf.csproj
@@ -60,7 +60,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\assets\Stride.Core.Assets.Quantum\Stride.Core.Assets.Quantum.csproj" />
     <ProjectReference Include="..\..\presentation\Stride.Core.Presentation.Wpf.Dialogs\Stride.Core.Presentation.Wpf.Dialogs.csproj" />
-    <ProjectReference Include="..\..\presentation\Stride.Core.Presentation.Graph\Stride.Core.Presentation.Wpf.Graph.csproj" />
+    <ProjectReference Include="..\..\presentation\Stride.Core.Presentation.Wpf.Graph\Stride.Core.Presentation.Wpf.Graph.csproj" />
     <ProjectReference Include="..\..\presentation\Stride.Core.Translation.Presentation\Stride.Core.Translation.Presentation.Wpf.csproj" />
     <ProjectReference Include="..\..\tools\Stride.ConnectionRouter\Stride.ConnectionRouter.csproj" />
     <ProjectReference Include="..\..\tools\Stride.Graphics.RenderDocPlugin\Stride.Graphics.RenderDocPlugin.csproj" />
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Behaviors/ActiveConnectorBehavior.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/ActiveConnectorBehavior.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Behaviors/ActiveConnectorBehavior.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/ActiveConnectorBehavior.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Behaviors/ConnectorDragBehavior.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/ConnectorDragBehavior.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Behaviors/ConnectorDragBehavior.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/ConnectorDragBehavior.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Behaviors/ConnectorDropBehavior.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/ConnectorDropBehavior.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Behaviors/ConnectorDropBehavior.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/ConnectorDropBehavior.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Behaviors/GraphContextMenuOpenedBehavior.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/GraphContextMenuOpenedBehavior.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Behaviors/GraphContextMenuOpenedBehavior.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/GraphContextMenuOpenedBehavior.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Behaviors/GraphSelectionBehavior.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/GraphSelectionBehavior.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Behaviors/GraphSelectionBehavior.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/GraphSelectionBehavior.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Behaviors/LinkPreviewBehavior.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/LinkPreviewBehavior.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Behaviors/LinkPreviewBehavior.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/LinkPreviewBehavior.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Behaviors/NodeGraphBehavior.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/NodeGraphBehavior.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Behaviors/NodeGraphBehavior.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/NodeGraphBehavior.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Behaviors/NodeGraphSelectionBehavior.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/NodeGraphSelectionBehavior.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Behaviors/NodeGraphSelectionBehavior.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Behaviors/NodeGraphSelectionBehavior.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Controls/NodeEdgeControl.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Controls/NodeEdgeControl.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Controls/NodeEdgeControl.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Controls/NodeEdgeControl.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Controls/NodeGraphArea.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Controls/NodeGraphArea.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Controls/NodeGraphArea.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Controls/NodeGraphArea.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Controls/NodeVertexControl.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Controls/NodeVertexControl.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Controls/NodeVertexControl.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Controls/NodeVertexControl.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Helper/MouseHelper.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Helper/MouseHelper.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Helper/MouseHelper.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Helper/MouseHelper.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Helper/UIHelper.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Helper/UIHelper.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Helper/UIHelper.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Helper/UIHelper.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/LinkSelectedEvent.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/LinkSelectedEvent.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/LinkSelectedEvent.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/LinkSelectedEvent.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Properties/AssemblyInfo.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Properties/AssemblyInfo.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Properties/AssemblyInfo.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Properties/AssemblyInfo.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Wpf.Graph.csproj b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Stride.Core.Presentation.Wpf.Graph.csproj
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Wpf.Graph.csproj
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Stride.Core.Presentation.Wpf.Graph.csproj
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/Themes/generic.xaml b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/Themes/generic.xaml
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/Themes/generic.xaml
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/Themes/generic.xaml
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/ViewModel/ConnectionWrapper.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/ConnectionWrapper.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/ViewModel/ConnectionWrapper.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/ConnectionWrapper.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeEdge.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeEdge.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeEdge.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeEdge.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeGraph.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeGraph.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeGraph.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeGraph.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeGraphControlFactory.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeGraphControlFactory.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeGraphControlFactory.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeGraphControlFactory.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeGraphLogicCore.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeGraphLogicCore.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeGraphLogicCore.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeGraphLogicCore.cs
diff --git a/sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeVertex.cs b/sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeVertex.cs
similarity index 100%
rename from sources/presentation/Stride.Core.Presentation.Graph/ViewModel/NodeVertex.cs
rename to sources/presentation/Stride.Core.Presentation.Wpf.Graph/ViewModel/NodeVertex.cs