diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..117d9ab
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,135 @@
+# Rules in this file were initially inferred by Visual Studio IntelliCode from the F:\AIStudio.Wpf.Controls codebase based on best match to current usage at 2022/1/23
+# You can modify the rules from these initially generated values to suit your own policies
+# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
+[*.cs]
+
+
+#Core editorconfig formatting - indentation
+
+#use soft tabs (spaces) for indentation
+indent_style = space
+
+#Formatting - indentation options
+
+#indent switch case contents.
+csharp_indent_case_contents = true
+#csharp_indent_case_contents_when_block
+csharp_indent_case_contents_when_block = true
+#indent switch labels
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+
+#place catch statements on a new line
+csharp_new_line_before_catch = true
+#place else statements on a new line
+csharp_new_line_before_else = true
+#require finally statements to be on a new line after the closing brace
+csharp_new_line_before_finally = true
+#require members of object intializers to be on separate lines
+csharp_new_line_before_members_in_object_initializers = true
+#require braces to be on a new line for types, control_blocks, methods, properties, object_collection_array_initializers, and accessors (also known as "Allman" style)
+csharp_new_line_before_open_brace = types, control_blocks, methods, properties, object_collection_array_initializers, accessors
+
+#Formatting - organize using options
+
+#sort System.* using directives alphabetically, and place them before other usings
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+
+#require NO space between a cast and the value
+csharp_space_after_cast = false
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_after_colon_in_inheritance_clause = true
+#require a space after a keyword in a control flow statement such as a for loop
+csharp_space_after_keywords_in_control_flow_statements = true
+#require a space before the colon for bases or interfaces in a type declaration
+csharp_space_before_colon_in_inheritance_clause = true
+#remove space within empty argument list parentheses
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+#remove space between method call name and opening parenthesis
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
+csharp_space_between_method_call_parameter_list_parentheses = false
+#remove space within empty parameter list parentheses for a method declaration
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+
+#leave code block on separate lines
+csharp_preserve_single_line_blocks = false
+#leave statements and member declarations on the same line
+csharp_preserve_single_line_statements = true
+
+#Style - Code block preferences
+
+#prefer curly braces even for one line of code
+csharp_prefer_braces = true:suggestion
+
+#Style - expression bodied member options
+
+#prefer block bodies for accessors
+csharp_style_expression_bodied_accessors = false:suggestion
+#prefer block bodies for constructors
+csharp_style_expression_bodied_constructors = false:suggestion
+#prefer block bodies for methods
+csharp_style_expression_bodied_methods = false:suggestion
+#prefer block bodies for properties
+csharp_style_expression_bodied_properties = false:suggestion
+
+#Style - expression level options
+
+#prefer out variables to be declared inline in the argument list of a method call when possible
+csharp_style_inlined_variable_declaration = true:suggestion
+#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+#Style - Expression-level  preferences
+
+#prefer default(T) over default
+csharp_prefer_simple_default_expression = false:suggestion
+#prefer objects to be initialized using object initializers when possible
+dotnet_style_object_initializer = true:suggestion
+
+#Style - implicit and explicit types
+
+#prefer explicit type over var in all cases, unless overridden by another code style rule
+csharp_style_var_elsewhere = false:suggestion
+#prefer explicit type over var to declare variables with built-in system types such as int
+csharp_style_var_for_built_in_types = false:suggestion
+#prefer explicit type over var when the type is already mentioned on the right-hand side of a declaration
+csharp_style_var_when_type_is_apparent = false:suggestion
+
+#Style - language keyword and framework type options
+
+#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+
+#Style - modifier options
+
+#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+
+#Style - Modifier preferences
+
+#when this rule is set to a list of modifiers, prefer the specified ordering.
+csharp_preferred_modifier_order = public,private,protected,internal,static,readonly,override,virtual,new,async:suggestion
+
+#Style - Pattern matching
+
+#prefer is expression with type casts instead of pattern matching
+csharp_style_pattern_matching_over_as_with_null_check = false:suggestion
+
+#Style - qualification options
+
+#prefer events to be prefaced with this. in C# or Me. in Visual Basic
+dotnet_style_qualification_for_event = true:suggestion
+#prefer fields not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_field = false:suggestion
+#prefer methods not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_method = false:suggestion
+#prefer properties not to be prefaced with this. or Me. in Visual Basic
+dotnet_style_qualification_for_property = false:suggestion
diff --git a/AIStudio.Wpf.ADiagram/Themes/Generic.xaml b/AIStudio.Wpf.ADiagram/Themes/Generic.xaml
deleted file mode 100644
index b9c18c3..0000000
--- a/AIStudio.Wpf.ADiagram/Themes/Generic.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ResourceDictionary.MergedDictionaries>      
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/ScrollBar.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/Expander.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/GroupBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/ToolTip.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/ScrollViewer.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/ZoomBox.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Util.DiagramDesigner;component/Resources/Styles/DesignerItems.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/Fluent.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/Expander.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/ListBox.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/Slider.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/TabControl.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Themes/Styles/ToggleButton.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/PathItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/PersistDesignerItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml"/>
-        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Extensions/ViewModels/SvgDesignerItemViewModel.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    
-</ResourceDictionary>
diff --git a/AIStudio.Wpf.Diagram.sln b/AIStudio.Wpf.Diagram.sln
index a9e0ebe..4fa5142 100644
--- a/AIStudio.Wpf.Diagram.sln
+++ b/AIStudio.Wpf.Diagram.sln
@@ -1,21 +1,27 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29509.3
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32922.545
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Util.DiagramDesigner", "Util.DiagramDesigner\Util.DiagramDesigner.csproj", "{3FC9F09D-83EA-4914-8980-A6B4C3352836}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.ADiagram", "AIStudio.Wpf.ADiagram\AIStudio.Wpf.ADiagram.csproj", "{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.BaseDiagram", "AIStudio.Wpf.BaseDiagram\AIStudio.Wpf.BaseDiagram.csproj", "{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Flowchart", "AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj", "{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.Logical", "AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj", "{CC68D39D-7935-4079-9CEB-FC2FD498D511}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{4959F170-02FB-4B7F-8F53-93DAF22713F9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIStudio.Wpf.SFC", "AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj", "{2AB69067-277E-4EE0-9949-8326A145EEE4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.SFC", "AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj", "{2AB69067-277E-4EE0-9949-8326A145EEE4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramApp", "AIStudio.Wpf.DiagramApp\AIStudio.Wpf.DiagramApp.csproj", "{4408F718-9C14-4404-A63B-9B785F9D4F35}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramDesigner", "AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj", "{EA1D893D-2F50-47AA-80A6-EA297F651CCC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AIStudio.Wpf.DiagramHelper", "AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj", "{1E77B64D-B457-4467-A5DB-BB7BA01806D9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{425E7DBD-25B9-4019-9C84-C37273A7F5C3}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		Directory.Build.Props = Directory.Build.Props
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,18 +29,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3FC9F09D-83EA-4914-8980-A6B4C3352836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FC9F09D-83EA-4914-8980-A6B4C3352836}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FC9F09D-83EA-4914-8980-A6B4C3352836}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3FC9F09D-83EA-4914-8980-A6B4C3352836}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D2DCA7D-9E0C-4E6E-ACD9-2CD18C75FE34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC7CFBB7-29AE-4660-A94B-B80CF317D3C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{86ED5B40-D185-4AFA-B5BD-BC8E78DB8758}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,6 +41,18 @@ Global
 		{2AB69067-277E-4EE0-9949-8326A145EEE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2AB69067-277E-4EE0-9949-8326A145EEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2AB69067-277E-4EE0-9949-8326A145EEE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4408F718-9C14-4404-A63B-9B785F9D4F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4408F718-9C14-4404-A63B-9B785F9D4F35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4408F718-9C14-4404-A63B-9B785F9D4F35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4408F718-9C14-4404-A63B-9B785F9D4F35}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA1D893D-2F50-47AA-80A6-EA297F651CCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA1D893D-2F50-47AA-80A6-EA297F651CCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA1D893D-2F50-47AA-80A6-EA297F651CCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA1D893D-2F50-47AA-80A6-EA297F651CCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E77B64D-B457-4467-A5DB-BB7BA01806D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E77B64D-B457-4467-A5DB-BB7BA01806D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E77B64D-B457-4467-A5DB-BB7BA01806D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E77B64D-B457-4467-A5DB-BB7BA01806D9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/AIStudio.Wpf.ADiagram/AIStudio.Wpf.ADiagram.csproj b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj
similarity index 99%
rename from AIStudio.Wpf.ADiagram/AIStudio.Wpf.ADiagram.csproj
rename to AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj
index bfffb96..36973e0 100644
--- a/AIStudio.Wpf.ADiagram/AIStudio.Wpf.ADiagram.csproj
+++ b/AIStudio.Wpf.DiagramApp/AIStudio.Wpf.DiagramApp.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
@@ -120,16 +119,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AIStudio.Wpf.BaseDiagram\AIStudio.Wpf.BaseDiagram.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj" />
     <ProjectReference Include="..\AIStudio.Wpf.Flowchart\AIStudio.Wpf.Flowchart.csproj" />
     <ProjectReference Include="..\AIStudio.Wpf.Logical\AIStudio.Wpf.Logical.csproj" />
     <ProjectReference Include="..\AIStudio.Wpf.SFC\AIStudio.Wpf.SFC.csproj" />
-    <ProjectReference Include="..\Util.DiagramDesigner\Util.DiagramDesigner.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="zxing.core">
-      <HintPath>zxing.core.dll</HintPath>
+      <HintPath>..\AIStudio.Wpf.DiagramHelper\DLL\zxing.core.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/AIStudio.Wpf.ADiagram/App.config b/AIStudio.Wpf.DiagramApp/App.config
similarity index 100%
rename from AIStudio.Wpf.ADiagram/App.config
rename to AIStudio.Wpf.DiagramApp/App.config
diff --git a/AIStudio.Wpf.ADiagram/App.xaml b/AIStudio.Wpf.DiagramApp/App.xaml
similarity index 82%
rename from AIStudio.Wpf.ADiagram/App.xaml
rename to AIStudio.Wpf.DiagramApp/App.xaml
index fef22ed..84b1410 100644
--- a/AIStudio.Wpf.ADiagram/App.xaml
+++ b/AIStudio.Wpf.DiagramApp/App.xaml
@@ -1,14 +1,14 @@
-<Application x:Class="AIStudio.Wpf.ADiagram.App"
+<Application x:Class="AIStudio.Wpf.DiagramApp.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:AIStudio.Wpf.ADiagram"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramApp"
              StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/Fluent;component/Themes/Generic.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/Generic.xaml" />
-                <ResourceDictionary Source="/AIStudio.Wpf.ADiagram;component/Themes/Generic.xaml" />
+                <ResourceDictionary Source="/AIStudio.Wpf.DiagramApp;component/Themes/Generic.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Flowchart;component/ViewModels/FlowNode.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Logical;component/ViewModels/LogicalGateItemViewModel.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.SFC;component/ViewModels/SFCNode.xaml"/>
diff --git a/AIStudio.Wpf.ADiagram/App.xaml.cs b/AIStudio.Wpf.DiagramApp/App.xaml.cs
similarity index 97%
rename from AIStudio.Wpf.ADiagram/App.xaml.cs
rename to AIStudio.Wpf.DiagramApp/App.xaml.cs
index dacd2f7..ec70fd8 100644
--- a/AIStudio.Wpf.ADiagram/App.xaml.cs
+++ b/AIStudio.Wpf.DiagramApp/App.xaml.cs
@@ -10,7 +10,7 @@ using System.Windows;
 //如果是WinForm（假定程序为MyDemo.exe，则需要一个MyDemo.exe.config文件）
 //如果是WebForm，则从web.config中读取相关信息
 [assembly: log4net.Config.XmlConfigurator(Watch = true)]
-namespace AIStudio.Wpf.ADiagram
+namespace AIStudio.Wpf.DiagramApp
 {
     /// <summary>
     /// Interaction logic for App.xaml
diff --git a/AIStudio.Wpf.ADiagram/DesignItems/Customs/1.json b/AIStudio.Wpf.DiagramApp/DesignItems/Customs/1.json
similarity index 96%
rename from AIStudio.Wpf.ADiagram/DesignItems/Customs/1.json
rename to AIStudio.Wpf.DiagramApp/DesignItems/Customs/1.json
index 73a0c04..9365190 100644
--- a/AIStudio.Wpf.ADiagram/DesignItems/Customs/1.json
+++ b/AIStudio.Wpf.DiagramApp/DesignItems/Customs/1.json
@@ -21,7 +21,7 @@
           "ItemWidth": 65.0,
           "ItemHeight": 65.0,
           "Icon": "M 0,0 H 60 V 40 C 30,30 30,50 0,40 Z",
-          "ItemTypeName": "AIStudio.Wpf.BaseDiagram.Extensions.ViewModels.PathItemViewModel",
+          "ItemTypeName": "AIStudio.Wpf.DiagramHelper.Extensions.ViewModels.PathItemViewModel",
           "Id": "da395032-ad9e-4dab-a035-f59bed5cb4c4",
           "ZIndex": 0,
           "IsGroup": false,
diff --git a/AIStudio.Wpf.ADiagram/Icons/App.ico b/AIStudio.Wpf.DiagramApp/Icons/App.ico
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Icons/App.ico
rename to AIStudio.Wpf.DiagramApp/Icons/App.ico
diff --git a/AIStudio.Wpf.ADiagram/Images/AlignObjectsBottom.png b/AIStudio.Wpf.DiagramApp/Images/AlignObjectsBottom.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/AlignObjectsBottom.png
rename to AIStudio.Wpf.DiagramApp/Images/AlignObjectsBottom.png
diff --git a/AIStudio.Wpf.ADiagram/Images/AlignObjectsCenteredHorizontal.png b/AIStudio.Wpf.DiagramApp/Images/AlignObjectsCenteredHorizontal.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/AlignObjectsCenteredHorizontal.png
rename to AIStudio.Wpf.DiagramApp/Images/AlignObjectsCenteredHorizontal.png
diff --git a/AIStudio.Wpf.ADiagram/Images/AlignObjectsCenteredVertical.png b/AIStudio.Wpf.DiagramApp/Images/AlignObjectsCenteredVertical.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/AlignObjectsCenteredVertical.png
rename to AIStudio.Wpf.DiagramApp/Images/AlignObjectsCenteredVertical.png
diff --git a/AIStudio.Wpf.ADiagram/Images/AlignObjectsLeft.png b/AIStudio.Wpf.DiagramApp/Images/AlignObjectsLeft.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/AlignObjectsLeft.png
rename to AIStudio.Wpf.DiagramApp/Images/AlignObjectsLeft.png
diff --git a/AIStudio.Wpf.ADiagram/Images/AlignObjectsRight.png b/AIStudio.Wpf.DiagramApp/Images/AlignObjectsRight.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/AlignObjectsRight.png
rename to AIStudio.Wpf.DiagramApp/Images/AlignObjectsRight.png
diff --git a/AIStudio.Wpf.ADiagram/Images/AlignObjectsTop.png b/AIStudio.Wpf.DiagramApp/Images/AlignObjectsTop.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/AlignObjectsTop.png
rename to AIStudio.Wpf.DiagramApp/Images/AlignObjectsTop.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Blue.png b/AIStudio.Wpf.DiagramApp/Images/Blue.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Blue.png
rename to AIStudio.Wpf.DiagramApp/Images/Blue.png
diff --git a/AIStudio.Wpf.ADiagram/Images/BlueLarge.png b/AIStudio.Wpf.DiagramApp/Images/BlueLarge.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/BlueLarge.png
rename to AIStudio.Wpf.DiagramApp/Images/BlueLarge.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Bold.png b/AIStudio.Wpf.DiagramApp/Images/Bold.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Bold.png
rename to AIStudio.Wpf.DiagramApp/Images/Bold.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Box.png b/AIStudio.Wpf.DiagramApp/Images/Box.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Box.png
rename to AIStudio.Wpf.DiagramApp/Images/Box.png
diff --git a/AIStudio.Wpf.ADiagram/Images/BringForward.png b/AIStudio.Wpf.DiagramApp/Images/BringForward.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/BringForward.png
rename to AIStudio.Wpf.DiagramApp/Images/BringForward.png
diff --git a/AIStudio.Wpf.ADiagram/Images/BringToFront.png b/AIStudio.Wpf.DiagramApp/Images/BringToFront.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/BringToFront.png
rename to AIStudio.Wpf.DiagramApp/Images/BringToFront.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Brown.png b/AIStudio.Wpf.DiagramApp/Images/Brown.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Brown.png
rename to AIStudio.Wpf.DiagramApp/Images/Brown.png
diff --git a/AIStudio.Wpf.ADiagram/Images/BrownLarge.png b/AIStudio.Wpf.DiagramApp/Images/BrownLarge.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/BrownLarge.png
rename to AIStudio.Wpf.DiagramApp/Images/BrownLarge.png
diff --git a/AIStudio.Wpf.ADiagram/Images/ChangeCase.png b/AIStudio.Wpf.DiagramApp/Images/ChangeCase.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/ChangeCase.png
rename to AIStudio.Wpf.DiagramApp/Images/ChangeCase.png
diff --git a/AIStudio.Wpf.ADiagram/Images/ClearFormatting.png b/AIStudio.Wpf.DiagramApp/Images/ClearFormatting.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/ClearFormatting.png
rename to AIStudio.Wpf.DiagramApp/Images/ClearFormatting.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Copy.png b/AIStudio.Wpf.DiagramApp/Images/Copy.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Copy.png
rename to AIStudio.Wpf.DiagramApp/Images/Copy.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Cut.png b/AIStudio.Wpf.DiagramApp/Images/Cut.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Cut.png
rename to AIStudio.Wpf.DiagramApp/Images/Cut.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Delete.png b/AIStudio.Wpf.DiagramApp/Images/Delete.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Delete.png
rename to AIStudio.Wpf.DiagramApp/Images/Delete.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Disconnect.png b/AIStudio.Wpf.DiagramApp/Images/Disconnect.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Disconnect.png
rename to AIStudio.Wpf.DiagramApp/Images/Disconnect.png
diff --git a/AIStudio.Wpf.ADiagram/Images/DistributeObjectsHorizontal.png b/AIStudio.Wpf.DiagramApp/Images/DistributeObjectsHorizontal.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/DistributeObjectsHorizontal.png
rename to AIStudio.Wpf.DiagramApp/Images/DistributeObjectsHorizontal.png
diff --git a/AIStudio.Wpf.ADiagram/Images/DistributeObjectsVertical.png b/AIStudio.Wpf.DiagramApp/Images/DistributeObjectsVertical.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/DistributeObjectsVertical.png
rename to AIStudio.Wpf.DiagramApp/Images/DistributeObjectsVertical.png
diff --git a/AIStudio.Wpf.ADiagram/Images/FontColor.png b/AIStudio.Wpf.DiagramApp/Images/FontColor.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/FontColor.png
rename to AIStudio.Wpf.DiagramApp/Images/FontColor.png
diff --git a/AIStudio.Wpf.ADiagram/Images/FormatPainter.png b/AIStudio.Wpf.DiagramApp/Images/FormatPainter.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/FormatPainter.png
rename to AIStudio.Wpf.DiagramApp/Images/FormatPainter.png
diff --git a/AIStudio.Wpf.ADiagram/Images/GIF.png b/AIStudio.Wpf.DiagramApp/Images/GIF.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/GIF.png
rename to AIStudio.Wpf.DiagramApp/Images/GIF.png
diff --git a/AIStudio.Wpf.ADiagram/Images/GalleryLarge.png b/AIStudio.Wpf.DiagramApp/Images/GalleryLarge.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/GalleryLarge.png
rename to AIStudio.Wpf.DiagramApp/Images/GalleryLarge.png
diff --git a/AIStudio.Wpf.ADiagram/Images/GenericDocument.png b/AIStudio.Wpf.DiagramApp/Images/GenericDocument.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/GenericDocument.png
rename to AIStudio.Wpf.DiagramApp/Images/GenericDocument.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Gray.png b/AIStudio.Wpf.DiagramApp/Images/Gray.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Gray.png
rename to AIStudio.Wpf.DiagramApp/Images/Gray.png
diff --git a/AIStudio.Wpf.ADiagram/Images/GrayLarge.png b/AIStudio.Wpf.DiagramApp/Images/GrayLarge.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/GrayLarge.png
rename to AIStudio.Wpf.DiagramApp/Images/GrayLarge.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Green.png b/AIStudio.Wpf.DiagramApp/Images/Green.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Green.png
rename to AIStudio.Wpf.DiagramApp/Images/Green.png
diff --git a/AIStudio.Wpf.ADiagram/Images/GreenLarge.png b/AIStudio.Wpf.DiagramApp/Images/GreenLarge.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/GreenLarge.png
rename to AIStudio.Wpf.DiagramApp/Images/GreenLarge.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Group.png b/AIStudio.Wpf.DiagramApp/Images/Group.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Group.png
rename to AIStudio.Wpf.DiagramApp/Images/Group.png
diff --git a/AIStudio.Wpf.ADiagram/Images/GrowFont.png b/AIStudio.Wpf.DiagramApp/Images/GrowFont.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/GrowFont.png
rename to AIStudio.Wpf.DiagramApp/Images/GrowFont.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Italic.png b/AIStudio.Wpf.DiagramApp/Images/Italic.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Italic.png
rename to AIStudio.Wpf.DiagramApp/Images/Italic.png
diff --git a/AIStudio.Wpf.ADiagram/Images/New.png b/AIStudio.Wpf.DiagramApp/Images/New.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/New.png
rename to AIStudio.Wpf.DiagramApp/Images/New.png
diff --git a/AIStudio.Wpf.ADiagram/Images/OpenFolder.png b/AIStudio.Wpf.DiagramApp/Images/OpenFolder.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/OpenFolder.png
rename to AIStudio.Wpf.DiagramApp/Images/OpenFolder.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Orange.png b/AIStudio.Wpf.DiagramApp/Images/Orange.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Orange.png
rename to AIStudio.Wpf.DiagramApp/Images/Orange.png
diff --git a/AIStudio.Wpf.ADiagram/Images/OrangeLarge.png b/AIStudio.Wpf.DiagramApp/Images/OrangeLarge.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/OrangeLarge.png
rename to AIStudio.Wpf.DiagramApp/Images/OrangeLarge.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Paste.png b/AIStudio.Wpf.DiagramApp/Images/Paste.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Paste.png
rename to AIStudio.Wpf.DiagramApp/Images/Paste.png
diff --git a/AIStudio.Wpf.ADiagram/Images/PasteBig.png b/AIStudio.Wpf.DiagramApp/Images/PasteBig.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/PasteBig.png
rename to AIStudio.Wpf.DiagramApp/Images/PasteBig.png
diff --git a/AIStudio.Wpf.ADiagram/Images/PasteFormating.png b/AIStudio.Wpf.DiagramApp/Images/PasteFormating.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/PasteFormating.png
rename to AIStudio.Wpf.DiagramApp/Images/PasteFormating.png
diff --git a/AIStudio.Wpf.ADiagram/Images/PasteImage.png b/AIStudio.Wpf.DiagramApp/Images/PasteImage.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/PasteImage.png
rename to AIStudio.Wpf.DiagramApp/Images/PasteImage.png
diff --git a/AIStudio.Wpf.ADiagram/Images/PasteSourceFormating.png b/AIStudio.Wpf.DiagramApp/Images/PasteSourceFormating.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/PasteSourceFormating.png
rename to AIStudio.Wpf.DiagramApp/Images/PasteSourceFormating.png
diff --git a/AIStudio.Wpf.ADiagram/Images/PasteText.png b/AIStudio.Wpf.DiagramApp/Images/PasteText.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/PasteText.png
rename to AIStudio.Wpf.DiagramApp/Images/PasteText.png
diff --git a/AIStudio.Wpf.ADiagram/Images/PasteTextOnly.png b/AIStudio.Wpf.DiagramApp/Images/PasteTextOnly.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/PasteTextOnly.png
rename to AIStudio.Wpf.DiagramApp/Images/PasteTextOnly.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Persist.png b/AIStudio.Wpf.DiagramApp/Images/Persist.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Persist.png
rename to AIStudio.Wpf.DiagramApp/Images/Persist.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Pink.png b/AIStudio.Wpf.DiagramApp/Images/Pink.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Pink.png
rename to AIStudio.Wpf.DiagramApp/Images/Pink.png
diff --git a/AIStudio.Wpf.ADiagram/Images/PinkLarge.png b/AIStudio.Wpf.DiagramApp/Images/PinkLarge.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/PinkLarge.png
rename to AIStudio.Wpf.DiagramApp/Images/PinkLarge.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Print.png b/AIStudio.Wpf.DiagramApp/Images/Print.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Print.png
rename to AIStudio.Wpf.DiagramApp/Images/Print.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Red.png b/AIStudio.Wpf.DiagramApp/Images/Red.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Red.png
rename to AIStudio.Wpf.DiagramApp/Images/Red.png
diff --git a/AIStudio.Wpf.ADiagram/Images/RedLarge.png b/AIStudio.Wpf.DiagramApp/Images/RedLarge.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/RedLarge.png
rename to AIStudio.Wpf.DiagramApp/Images/RedLarge.png
diff --git a/AIStudio.Wpf.ADiagram/Images/SVG.png b/AIStudio.Wpf.DiagramApp/Images/SVG.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/SVG.png
rename to AIStudio.Wpf.DiagramApp/Images/SVG.png
diff --git a/AIStudio.Wpf.ADiagram/Images/SampleImageForScreenTip.png b/AIStudio.Wpf.DiagramApp/Images/SampleImageForScreenTip.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/SampleImageForScreenTip.png
rename to AIStudio.Wpf.DiagramApp/Images/SampleImageForScreenTip.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Save.png b/AIStudio.Wpf.DiagramApp/Images/Save.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Save.png
rename to AIStudio.Wpf.DiagramApp/Images/Save.png
diff --git a/AIStudio.Wpf.ADiagram/Images/SendBackward.png b/AIStudio.Wpf.DiagramApp/Images/SendBackward.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/SendBackward.png
rename to AIStudio.Wpf.DiagramApp/Images/SendBackward.png
diff --git a/AIStudio.Wpf.ADiagram/Images/SendToBack.png b/AIStudio.Wpf.DiagramApp/Images/SendToBack.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/SendToBack.png
rename to AIStudio.Wpf.DiagramApp/Images/SendToBack.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Setting.png b/AIStudio.Wpf.DiagramApp/Images/Setting.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Setting.png
rename to AIStudio.Wpf.DiagramApp/Images/Setting.png
diff --git a/AIStudio.Wpf.ADiagram/Images/ShrinkFont.png b/AIStudio.Wpf.DiagramApp/Images/ShrinkFont.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/ShrinkFont.png
rename to AIStudio.Wpf.DiagramApp/Images/ShrinkFont.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Strikethrough.png b/AIStudio.Wpf.DiagramApp/Images/Strikethrough.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Strikethrough.png
rename to AIStudio.Wpf.DiagramApp/Images/Strikethrough.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Subscript.png b/AIStudio.Wpf.DiagramApp/Images/Subscript.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Subscript.png
rename to AIStudio.Wpf.DiagramApp/Images/Subscript.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Superscript.png b/AIStudio.Wpf.DiagramApp/Images/Superscript.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Superscript.png
rename to AIStudio.Wpf.DiagramApp/Images/Superscript.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/account-book.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/account-book.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/account-book.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/account-book.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/alert.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/alert.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/alert.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/alert.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/alipay-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/alipay-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/alipay-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/alipay-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/alipay-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/alipay-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/alipay-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/alipay-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/aliwangwang.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/aliwangwang.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/aliwangwang.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/aliwangwang.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/amazon-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/amazon-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/amazon-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/amazon-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/amazon-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/amazon-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/amazon-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/amazon-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/android.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/android.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/android.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/android.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/api.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/api.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/api.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/api.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/apple.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/apple.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/apple.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/apple.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/appstore.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/appstore.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/appstore.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/appstore.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/audio.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/audio.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/audio.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/audio.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/backward.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/backward.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/backward.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/backward.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/bank.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/bank.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/bank.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/bank.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/behance-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/behance-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/behance-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/behance-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/behance-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/behance-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/behance-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/behance-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/bell.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/bell.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/bell.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/bell.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/book.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/book.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/book.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/book.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/box-plot.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/box-plot.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/box-plot.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/box-plot.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/bug.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/bug.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/bug.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/bug.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/build.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/build.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/build.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/build.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/bulb.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/bulb.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/bulb.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/bulb.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/calculator.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/calculator.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/calculator.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/calculator.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/calendar.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/calendar.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/calendar.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/calendar.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/camera.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/camera.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/camera.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/camera.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/car.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/car.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/car.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/car.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/caret-down.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/caret-down.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/caret-down.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/caret-down.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/caret-left.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/caret-left.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/caret-left.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/caret-left.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/caret-right.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/caret-right.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/caret-right.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/caret-right.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/caret-up.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/caret-up.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/caret-up.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/caret-up.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/carry-out.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/carry-out.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/carry-out.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/carry-out.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/check-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/check-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/check-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/check-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/check-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/check-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/check-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/check-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/chrome.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/chrome.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/chrome.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/chrome.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/ci-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/ci-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/ci-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/ci-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/clock-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/clock-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/clock-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/clock-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/close-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/close-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/close-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/close-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/close-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/close-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/close-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/close-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/cloud.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/cloud.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/cloud.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/cloud.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/code-sandbox-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/code-sandbox-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/code-sandbox-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/code-sandbox-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/code-sandbox-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/code-sandbox-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/code-sandbox-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/code-sandbox-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/code.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/code.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/code.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/code.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/codepen-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/codepen-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/codepen-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/codepen-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/codepen-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/codepen-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/codepen-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/codepen-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/compass.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/compass.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/compass.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/compass.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/contacts.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/contacts.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/contacts.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/contacts.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/container.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/container.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/container.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/container.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/control.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/control.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/control.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/control.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/copy.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/copy.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/copy.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/copy.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/copyright-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/copyright-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/copyright-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/copyright-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/credit-card.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/credit-card.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/credit-card.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/credit-card.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/crown.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/crown.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/crown.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/crown.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/customer-service.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/customer-service.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/customer-service.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/customer-service.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/dashboard.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/dashboard.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/dashboard.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/dashboard.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/database.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/database.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/database.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/database.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/delete.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/delete.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/delete.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/delete.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/diff.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/diff.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/diff.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/diff.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/dingtalk-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/dingtalk-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/dingtalk-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/dingtalk-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/dingtalk-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/dingtalk-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/dingtalk-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/dingtalk-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/dislike.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/dislike.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/dislike.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/dislike.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/dollar-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/dollar-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/dollar-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/dollar-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/down-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/down-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/down-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/down-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/down-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/down-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/down-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/down-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/dribbble-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/dribbble-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/dribbble-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/dribbble-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/dribbble-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/dribbble-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/dribbble-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/dribbble-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/dropbox-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/dropbox-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/dropbox-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/dropbox-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/dropbox-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/dropbox-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/dropbox-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/dropbox-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/edit.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/edit.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/edit.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/edit.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/environment.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/environment.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/environment.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/environment.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/euro-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/euro-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/euro-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/euro-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/exclamation-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/exclamation-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/exclamation-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/exclamation-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/experiment.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/experiment.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/experiment.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/experiment.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/eye-invisible.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/eye-invisible.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/eye-invisible.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/eye-invisible.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/eye.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/eye.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/eye.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/eye.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/facebook.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/facebook.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/facebook.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/facebook.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/fast-backward.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/fast-backward.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/fast-backward.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/fast-backward.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/fast-forward.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/fast-forward.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/fast-forward.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/fast-forward.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-add.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-add.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-add.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-add.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-excel.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-excel.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-excel.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-excel.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-exclamation.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-exclamation.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-exclamation.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-exclamation.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-image.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-image.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-image.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-image.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-markdown.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-markdown.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-markdown.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-markdown.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-pdf.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-pdf.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-pdf.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-pdf.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-ppt.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-ppt.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-ppt.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-ppt.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-text.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-text.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-text.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-text.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-unknown.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-unknown.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-unknown.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-unknown.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-word.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-word.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-word.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-word.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file-zip.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file-zip.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file-zip.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file-zip.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/file.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/file.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/file.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/file.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/filter.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/filter.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/filter.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/filter.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/fire.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/fire.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/fire.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/fire.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/flag.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/flag.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/flag.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/flag.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/folder-add.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/folder-add.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/folder-add.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/folder-add.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/folder-open.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/folder-open.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/folder-open.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/folder-open.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/folder.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/folder.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/folder.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/folder.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/forward.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/forward.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/forward.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/forward.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/frown.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/frown.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/frown.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/frown.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/fund.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/fund.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/fund.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/fund.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/funnel-plot.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/funnel-plot.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/funnel-plot.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/funnel-plot.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/gift.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/gift.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/gift.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/gift.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/github.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/github.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/github.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/github.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/gitlab.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/gitlab.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/gitlab.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/gitlab.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/golden.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/golden.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/golden.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/golden.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/google-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/google-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/google-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/google-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/google-plus-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/google-plus-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/google-plus-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/google-plus-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/google-plus-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/google-plus-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/google-plus-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/google-plus-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/google-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/google-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/google-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/google-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/hdd.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/hdd.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/hdd.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/hdd.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/heart.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/heart.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/heart.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/heart.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/highlight.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/highlight.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/highlight.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/highlight.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/home.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/home.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/home.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/home.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/hourglass.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/hourglass.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/hourglass.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/hourglass.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/html5.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/html5.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/html5.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/html5.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/idcard.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/idcard.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/idcard.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/idcard.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/ie-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/ie-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/ie-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/ie-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/ie-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/ie-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/ie-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/ie-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/info-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/info-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/info-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/info-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/instagram.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/instagram.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/instagram.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/instagram.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/insurance.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/insurance.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/insurance.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/insurance.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/interaction.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/interaction.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/interaction.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/interaction.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/interation.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/interation.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/interation.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/interation.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/layout.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/layout.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/layout.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/layout.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/left-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/left-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/left-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/left-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/left-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/left-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/left-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/left-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/like.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/like.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/like.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/like.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/linkedin.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/linkedin.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/linkedin.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/linkedin.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/lock.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/lock.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/lock.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/lock.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/mail.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/mail.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/mail.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/mail.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/medicine-box.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/medicine-box.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/medicine-box.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/medicine-box.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/medium-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/medium-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/medium-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/medium-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/medium-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/medium-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/medium-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/medium-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/meh.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/meh.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/meh.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/meh.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/message.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/message.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/message.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/message.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/minus-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/minus-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/minus-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/minus-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/minus-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/minus-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/minus-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/minus-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/mobile.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/mobile.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/mobile.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/mobile.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/money-collect.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/money-collect.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/money-collect.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/money-collect.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/notification.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/notification.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/notification.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/notification.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/pause-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/pause-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/pause-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/pause-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/pay-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/pay-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/pay-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/pay-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/phone.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/phone.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/phone.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/phone.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/picture.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/picture.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/picture.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/picture.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/pie-chart.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/pie-chart.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/pie-chart.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/pie-chart.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/play-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/play-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/play-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/play-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/play-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/play-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/play-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/play-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/plus-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/plus-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/plus-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/plus-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/plus-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/plus-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/plus-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/plus-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/pound-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/pound-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/pound-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/pound-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/printer.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/printer.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/printer.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/printer.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/profile.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/profile.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/profile.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/profile.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/project.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/project.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/project.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/project.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/property-safety.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/property-safety.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/property-safety.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/property-safety.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/pushpin.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/pushpin.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/pushpin.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/pushpin.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/qq-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/qq-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/qq-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/qq-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/qq-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/qq-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/qq-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/qq-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/question-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/question-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/question-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/question-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/read.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/read.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/read.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/read.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/reconciliation.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/reconciliation.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/reconciliation.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/reconciliation.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/red-envelope.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/red-envelope.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/red-envelope.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/red-envelope.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/reddit-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/reddit-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/reddit-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/reddit-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/reddit-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/reddit-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/reddit-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/reddit-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/rest.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/rest.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/rest.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/rest.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/right-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/right-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/right-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/right-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/right-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/right-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/right-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/right-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/rocket.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/rocket.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/rocket.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/rocket.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/safety-certificate.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/safety-certificate.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/safety-certificate.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/safety-certificate.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/save.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/save.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/save.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/save.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/schedule.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/schedule.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/schedule.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/schedule.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/security-scan.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/security-scan.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/security-scan.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/security-scan.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/setting.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/setting.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/setting.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/setting.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/shop.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/shop.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/shop.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/shop.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/shopping.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/shopping.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/shopping.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/shopping.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/sketch-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/sketch-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/sketch-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/sketch-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/sketch-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/sketch-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/sketch-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/sketch-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/skin.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/skin.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/skin.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/skin.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/skype.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/skype.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/skype.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/skype.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/slack-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/slack-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/slack-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/slack-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/slack-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/slack-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/slack-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/slack-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/sliders.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/sliders.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/sliders.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/sliders.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/smile.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/smile.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/smile.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/smile.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/snippets.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/snippets.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/snippets.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/snippets.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/sound.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/sound.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/sound.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/sound.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/star.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/star.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/star.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/star.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/step-backward.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/step-backward.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/step-backward.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/step-backward.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/step-forward.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/step-forward.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/step-forward.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/step-forward.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/stop.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/stop.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/stop.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/stop.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/switcher.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/switcher.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/switcher.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/switcher.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/tablet.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/tablet.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/tablet.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/tablet.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/tag.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/tag.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/tag.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/tag.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/tags.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/tags.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/tags.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/tags.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/taobao-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/taobao-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/taobao-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/taobao-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/taobao-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/taobao-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/taobao-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/taobao-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/thunderbolt.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/thunderbolt.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/thunderbolt.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/thunderbolt.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/tool.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/tool.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/tool.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/tool.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/trademark-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/trademark-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/trademark-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/trademark-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/trophy.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/trophy.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/trophy.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/trophy.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/twitter-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/twitter-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/twitter-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/twitter-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/twitter-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/twitter-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/twitter-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/twitter-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/unlock.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/unlock.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/unlock.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/unlock.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/up-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/up-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/up-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/up-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/up-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/up-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/up-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/up-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/usb.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/usb.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/usb.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/usb.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/video-camera.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/video-camera.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/video-camera.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/video-camera.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/wallet.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/wallet.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/wallet.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/wallet.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/warning.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/warning.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/warning.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/warning.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/wechat.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/wechat.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/wechat.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/wechat.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/weibo-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/weibo-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/weibo-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/weibo-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/weibo-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/weibo-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/weibo-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/weibo-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/windows.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/windows.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/windows.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/windows.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/yahoo.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/yahoo.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/yahoo.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/yahoo.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/youtube.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/youtube.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/youtube.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/youtube.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/yuque.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/yuque.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/yuque.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/yuque.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/zhihu-circle.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/zhihu-circle.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/zhihu-circle.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/zhihu-circle.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Svgs/zhihu-square.svg b/AIStudio.Wpf.DiagramApp/Images/Svgs/zhihu-square.svg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Svgs/zhihu-square.svg
rename to AIStudio.Wpf.DiagramApp/Images/Svgs/zhihu-square.svg
diff --git a/AIStudio.Wpf.ADiagram/Images/Test16.png b/AIStudio.Wpf.DiagramApp/Images/Test16.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Test16.png
rename to AIStudio.Wpf.DiagramApp/Images/Test16.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Test32.png b/AIStudio.Wpf.DiagramApp/Images/Test32.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Test32.png
rename to AIStudio.Wpf.DiagramApp/Images/Test32.png
diff --git a/AIStudio.Wpf.ADiagram/Images/TextEffects.png b/AIStudio.Wpf.DiagramApp/Images/TextEffects.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/TextEffects.png
rename to AIStudio.Wpf.DiagramApp/Images/TextEffects.png
diff --git a/AIStudio.Wpf.ADiagram/Images/TextHighlightColor.png b/AIStudio.Wpf.DiagramApp/Images/TextHighlightColor.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/TextHighlightColor.png
rename to AIStudio.Wpf.DiagramApp/Images/TextHighlightColor.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Underline.png b/AIStudio.Wpf.DiagramApp/Images/Underline.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Underline.png
rename to AIStudio.Wpf.DiagramApp/Images/Underline.png
diff --git a/AIStudio.Wpf.ADiagram/Images/Ungroup.png b/AIStudio.Wpf.DiagramApp/Images/Ungroup.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Ungroup.png
rename to AIStudio.Wpf.DiagramApp/Images/Ungroup.png
diff --git a/AIStudio.Wpf.ADiagram/Images/VIDEO.png b/AIStudio.Wpf.DiagramApp/Images/VIDEO.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/VIDEO.png
rename to AIStudio.Wpf.DiagramApp/Images/VIDEO.png
diff --git a/AIStudio.Wpf.ADiagram/Images/VectorIcons.xaml b/AIStudio.Wpf.DiagramApp/Images/VectorIcons.xaml
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/VectorIcons.xaml
rename to AIStudio.Wpf.DiagramApp/Images/VectorIcons.xaml
diff --git a/AIStudio.Wpf.ADiagram/Images/Yellow.png b/AIStudio.Wpf.DiagramApp/Images/Yellow.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/Yellow.png
rename to AIStudio.Wpf.DiagramApp/Images/Yellow.png
diff --git a/AIStudio.Wpf.ADiagram/Images/YellowLarge.png b/AIStudio.Wpf.DiagramApp/Images/YellowLarge.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/YellowLarge.png
rename to AIStudio.Wpf.DiagramApp/Images/YellowLarge.png
diff --git a/AIStudio.Wpf.ADiagram/Images/application_side_boxes.png b/AIStudio.Wpf.DiagramApp/Images/application_side_boxes.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/application_side_boxes.png
rename to AIStudio.Wpf.DiagramApp/Images/application_side_boxes.png
diff --git a/AIStudio.Wpf.ADiagram/Images/banner.png b/AIStudio.Wpf.DiagramApp/Images/banner.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/banner.png
rename to AIStudio.Wpf.DiagramApp/Images/banner.png
diff --git a/AIStudio.Wpf.ADiagram/Images/contactme.png b/AIStudio.Wpf.DiagramApp/Images/contactme.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/contactme.png
rename to AIStudio.Wpf.DiagramApp/Images/contactme.png
diff --git a/AIStudio.Wpf.ADiagram/Images/diagram.png b/AIStudio.Wpf.DiagramApp/Images/diagram.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/diagram.png
rename to AIStudio.Wpf.DiagramApp/Images/diagram.png
diff --git a/AIStudio.Wpf.ADiagram/Images/error.png b/AIStudio.Wpf.DiagramApp/Images/error.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/error.png
rename to AIStudio.Wpf.DiagramApp/Images/error.png
diff --git a/AIStudio.Wpf.ADiagram/Images/exit.png b/AIStudio.Wpf.DiagramApp/Images/exit.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/exit.png
rename to AIStudio.Wpf.DiagramApp/Images/exit.png
diff --git a/AIStudio.Wpf.ADiagram/Images/help.jpg b/AIStudio.Wpf.DiagramApp/Images/help.jpg
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/help.jpg
rename to AIStudio.Wpf.DiagramApp/Images/help.jpg
diff --git a/AIStudio.Wpf.ADiagram/Images/image.png b/AIStudio.Wpf.DiagramApp/Images/image.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/image.png
rename to AIStudio.Wpf.DiagramApp/Images/image.png
diff --git a/AIStudio.Wpf.ADiagram/Images/line-dashed.png b/AIStudio.Wpf.DiagramApp/Images/line-dashed.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/line-dashed.png
rename to AIStudio.Wpf.DiagramApp/Images/line-dashed.png
diff --git a/AIStudio.Wpf.ADiagram/Images/line-height.png b/AIStudio.Wpf.DiagramApp/Images/line-height.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/line-height.png
rename to AIStudio.Wpf.DiagramApp/Images/line-height.png
diff --git a/AIStudio.Wpf.ADiagram/Images/link.png b/AIStudio.Wpf.DiagramApp/Images/link.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/link.png
rename to AIStudio.Wpf.DiagramApp/Images/link.png
diff --git a/AIStudio.Wpf.ADiagram/Images/open.png b/AIStudio.Wpf.DiagramApp/Images/open.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/open.png
rename to AIStudio.Wpf.DiagramApp/Images/open.png
diff --git a/AIStudio.Wpf.ADiagram/Images/page_white_stack.png b/AIStudio.Wpf.DiagramApp/Images/page_white_stack.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/page_white_stack.png
rename to AIStudio.Wpf.DiagramApp/Images/page_white_stack.png
diff --git a/AIStudio.Wpf.ADiagram/Images/pencil.png b/AIStudio.Wpf.DiagramApp/Images/pencil.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/pencil.png
rename to AIStudio.Wpf.DiagramApp/Images/pencil.png
diff --git a/AIStudio.Wpf.ADiagram/Images/redo.png b/AIStudio.Wpf.DiagramApp/Images/redo.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/redo.png
rename to AIStudio.Wpf.DiagramApp/Images/redo.png
diff --git a/AIStudio.Wpf.ADiagram/Images/saveas.png b/AIStudio.Wpf.DiagramApp/Images/saveas.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/saveas.png
rename to AIStudio.Wpf.DiagramApp/Images/saveas.png
diff --git a/AIStudio.Wpf.ADiagram/Images/text.png b/AIStudio.Wpf.DiagramApp/Images/text.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/text.png
rename to AIStudio.Wpf.DiagramApp/Images/text.png
diff --git a/AIStudio.Wpf.ADiagram/Images/undo.png b/AIStudio.Wpf.DiagramApp/Images/undo.png
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Images/undo.png
rename to AIStudio.Wpf.DiagramApp/Images/undo.png
diff --git a/AIStudio.Wpf.ADiagram/Models/ColorType.cs b/AIStudio.Wpf.DiagramApp/Models/ColorType.cs
similarity index 83%
rename from AIStudio.Wpf.ADiagram/Models/ColorType.cs
rename to AIStudio.Wpf.DiagramApp/Models/ColorType.cs
index 7aa6d24..7c66e4d 100644
--- a/AIStudio.Wpf.ADiagram/Models/ColorType.cs
+++ b/AIStudio.Wpf.DiagramApp/Models/ColorType.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.ADiagram.Models
+namespace AIStudio.Wpf.DiagramApp.Models
 {
     public enum ColorType
     {
diff --git a/AIStudio.Wpf.ADiagram/Models/DiagramDocument.cs b/AIStudio.Wpf.DiagramApp/Models/DiagramDocument.cs
similarity index 90%
rename from AIStudio.Wpf.ADiagram/Models/DiagramDocument.cs
rename to AIStudio.Wpf.DiagramApp/Models/DiagramDocument.cs
index f197eb4..1f2d0af 100644
--- a/AIStudio.Wpf.ADiagram/Models/DiagramDocument.cs
+++ b/AIStudio.Wpf.DiagramApp/Models/DiagramDocument.cs
@@ -6,9 +6,9 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.ADiagram.Models
+namespace AIStudio.Wpf.DiagramApp.Models
 {
     [XmlRootAttribute(Namespace = DiagramDocument.XMLNS, IsNullable = false)]
     public class DiagramDocument
@@ -22,7 +22,7 @@ namespace AIStudio.Wpf.ADiagram.Models
         [XmlArray]
         public List<DiagramItem> DiagramItems { get; set; }
 
-        public const string XMLNS = "http://AIStudio.Wpf.ADiagram/DesignLayout";
+        public const string XMLNS = "http://AIStudio.Wpf.DiagramApp/DesignLayout";
         private readonly object saveLock = new Object();
 
         public void Save(FileInfo designFile)
diff --git a/AIStudio.Wpf.ADiagram/Models/DiagramItem.cs b/AIStudio.Wpf.DiagramApp/Models/DiagramItem.cs
similarity index 98%
rename from AIStudio.Wpf.ADiagram/Models/DiagramItem.cs
rename to AIStudio.Wpf.DiagramApp/Models/DiagramItem.cs
index 9652488..3513431 100644
--- a/AIStudio.Wpf.ADiagram/Models/DiagramItem.cs
+++ b/AIStudio.Wpf.DiagramApp/Models/DiagramItem.cs
@@ -1,4 +1,4 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -8,8 +8,8 @@ using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
 using AIStudio.Wpf.Flowchart;
-using AIStudio.Wpf.BaseDiagram.Extensions.ViewModels;
-using AIStudio.Wpf.BaseDiagram.Extensions.Models;
+using AIStudio.Wpf.DiagramHelper.Extensions.ViewModels;
+using AIStudio.Wpf.DiagramHelper.Extensions.Models;
 using Newtonsoft.Json;
 using AIStudio.Wpf.Flowchart.Models;
 using AIStudio.Wpf.Flowchart.ViewModels;
@@ -18,7 +18,7 @@ using AIStudio.Wpf.SFC.ViewModels;
 using System.Windows;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.ADiagram.Models
+namespace AIStudio.Wpf.DiagramApp.Models
 {
     [Serializable]
     public class DiagramItem
diff --git a/AIStudio.Wpf.ADiagram/Models/PathToolBoxData.cs b/AIStudio.Wpf.DiagramApp/Models/PathToolBoxData.cs
similarity index 96%
rename from AIStudio.Wpf.ADiagram/Models/PathToolBoxData.cs
rename to AIStudio.Wpf.DiagramApp/Models/PathToolBoxData.cs
index d93faa1..72b3cac 100644
--- a/AIStudio.Wpf.ADiagram/Models/PathToolBoxData.cs
+++ b/AIStudio.Wpf.DiagramApp/Models/PathToolBoxData.cs
@@ -2,10 +2,10 @@
 using AIStudio.Wpf.SFC;
 using System;
 using System.Windows.Media;
-using Util.DiagramDesigner;
-using Util.DiagramDesigner.Helpers;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner.Helpers;
 
-namespace AIStudio.Wpf.ADiagram.Models
+namespace AIStudio.Wpf.DiagramApp.Models
 {
     public class PathToolBoxData : ToolBoxData
     {
diff --git a/AIStudio.Wpf.DiagramApp/Themes/Generic.xaml b/AIStudio.Wpf.DiagramApp/Themes/Generic.xaml
new file mode 100644
index 0000000..acecd78
--- /dev/null
+++ b/AIStudio.Wpf.DiagramApp/Themes/Generic.xaml
@@ -0,0 +1,28 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>      
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ScrollBar.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/Expander.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/GroupBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ToolTip.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ScrollViewer.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/ZoomBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Resources/Styles/DesignerItems.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/Fluent.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/Expander.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/ListBox.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/Slider.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/TabControl.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Themes/Styles/ToggleButton.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Extensions/ViewModels/PathItemViewModel.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Extensions/ViewModels/PersistDesignerItemViewModel.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Extensions/ViewModels/SvgDesignerItemViewModel.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    
+</ResourceDictionary>
diff --git a/AIStudio.Wpf.ADiagram/Themes/Shared.xaml b/AIStudio.Wpf.DiagramApp/Themes/Shared.xaml
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Themes/Shared.xaml
rename to AIStudio.Wpf.DiagramApp/Themes/Shared.xaml
diff --git a/AIStudio.Wpf.ADiagram/Themes/Styles/Expander.xaml b/AIStudio.Wpf.DiagramApp/Themes/Styles/Expander.xaml
similarity index 99%
rename from AIStudio.Wpf.ADiagram/Themes/Styles/Expander.xaml
rename to AIStudio.Wpf.DiagramApp/Themes/Styles/Expander.xaml
index 79b649f..9c47875 100644
--- a/AIStudio.Wpf.ADiagram/Themes/Styles/Expander.xaml
+++ b/AIStudio.Wpf.DiagramApp/Themes/Styles/Expander.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters;assembly=AIStudio.Wpf.BaseDiagram">
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper">
     <converter:ThicknessBindingConverter x:Key="ThicknessBindingConverter"/>
 
     <Style x:Key="DefaultExpanderBaseHeaderStyle" TargetType="{x:Type ToggleButton}">
diff --git a/AIStudio.Wpf.ADiagram/Themes/Styles/Fluent.xaml b/AIStudio.Wpf.DiagramApp/Themes/Styles/Fluent.xaml
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Themes/Styles/Fluent.xaml
rename to AIStudio.Wpf.DiagramApp/Themes/Styles/Fluent.xaml
diff --git a/AIStudio.Wpf.ADiagram/Themes/Styles/ListBox.xaml b/AIStudio.Wpf.DiagramApp/Themes/Styles/ListBox.xaml
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Themes/Styles/ListBox.xaml
rename to AIStudio.Wpf.DiagramApp/Themes/Styles/ListBox.xaml
diff --git a/AIStudio.Wpf.ADiagram/Themes/Styles/Slider.xaml b/AIStudio.Wpf.DiagramApp/Themes/Styles/Slider.xaml
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Themes/Styles/Slider.xaml
rename to AIStudio.Wpf.DiagramApp/Themes/Styles/Slider.xaml
diff --git a/AIStudio.Wpf.ADiagram/Themes/Styles/TabControl.xaml b/AIStudio.Wpf.DiagramApp/Themes/Styles/TabControl.xaml
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Themes/Styles/TabControl.xaml
rename to AIStudio.Wpf.DiagramApp/Themes/Styles/TabControl.xaml
diff --git a/AIStudio.Wpf.ADiagram/Themes/Styles/ToggleButton.xaml b/AIStudio.Wpf.DiagramApp/Themes/Styles/ToggleButton.xaml
similarity index 100%
rename from AIStudio.Wpf.ADiagram/Themes/Styles/ToggleButton.xaml
rename to AIStudio.Wpf.DiagramApp/Themes/Styles/ToggleButton.xaml
diff --git a/AIStudio.Wpf.ADiagram/ViewModels/DiagramsViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/DiagramsViewModel.cs
similarity index 99%
rename from AIStudio.Wpf.ADiagram/ViewModels/DiagramsViewModel.cs
rename to AIStudio.Wpf.DiagramApp/ViewModels/DiagramsViewModel.cs
index 1104e34..5b22234 100644
--- a/AIStudio.Wpf.ADiagram/ViewModels/DiagramsViewModel.cs
+++ b/AIStudio.Wpf.DiagramApp/ViewModels/DiagramsViewModel.cs
@@ -1,8 +1,8 @@
-using AIStudio.Wpf.BaseDiagram.Commands;
+using AIStudio.Wpf.DiagramHelper.Commands;
 using AIStudio.Wpf.Flowchart;
-using AIStudio.Wpf.BaseDiagram.Extensions.ViewModels;
-using AIStudio.Wpf.BaseDiagram.Helpers;
-using AIStudio.Wpf.ADiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Extensions.ViewModels;
+using AIStudio.Wpf.DiagramHelper.Helpers;
+using AIStudio.Wpf.DiagramApp.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -15,10 +15,10 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Xml.Serialization;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using ZXing;
 
-namespace AIStudio.Wpf.ADiagram.ViewModels
+namespace AIStudio.Wpf.DiagramApp.ViewModels
 {
     public partial class DiagramsViewModel : BindableBase
     {
@@ -1093,7 +1093,7 @@ namespace AIStudio.Wpf.ADiagram.ViewModels
 
         public void AddBarcodeExecuted(object para)
         {
-            BarcodeDesignerItemViewModel itemBase = new BarcodeDesignerItemViewModel() { Format = (BarcodeFormat)Enum.Parse(typeof(BarcodeFormat), para.ToString()), Text="AIStudio.Wpf.ADiagram" };
+            BarcodeDesignerItemViewModel itemBase = new BarcodeDesignerItemViewModel() { Format = (BarcodeFormat)Enum.Parse(typeof(BarcodeFormat), para.ToString()), Text="AIStudio.Wpf.DiagramApp" };
             DiagramViewModel.DirectAddItemCommand.Execute(itemBase);
             if (itemBase.Parent != null)
             {
diff --git a/AIStudio.Wpf.ADiagram/ViewModels/FlowchartViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/FlowchartViewModel.cs
similarity index 98%
rename from AIStudio.Wpf.ADiagram/ViewModels/FlowchartViewModel.cs
rename to AIStudio.Wpf.DiagramApp/ViewModels/FlowchartViewModel.cs
index fe77904..94e1e3b 100644
--- a/AIStudio.Wpf.ADiagram/ViewModels/FlowchartViewModel.cs
+++ b/AIStudio.Wpf.DiagramApp/ViewModels/FlowchartViewModel.cs
@@ -1,5 +1,5 @@
-using AIStudio.Wpf.ADiagram.Models;
-using AIStudio.Wpf.ADiagram.ViewModels;
+using AIStudio.Wpf.DiagramApp.Models;
+using AIStudio.Wpf.DiagramApp.ViewModels;
 using AIStudio.Wpf.Flowchart.ViewModels;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Flowchart
 {
diff --git a/AIStudio.Wpf.ADiagram/ViewModels/LogicalViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/LogicalViewModel.cs
similarity index 99%
rename from AIStudio.Wpf.ADiagram/ViewModels/LogicalViewModel.cs
rename to AIStudio.Wpf.DiagramApp/ViewModels/LogicalViewModel.cs
index db61262..19a61b6 100644
--- a/AIStudio.Wpf.ADiagram/ViewModels/LogicalViewModel.cs
+++ b/AIStudio.Wpf.DiagramApp/ViewModels/LogicalViewModel.cs
@@ -1,11 +1,11 @@
-using AIStudio.Wpf.ADiagram.Models;
-using AIStudio.Wpf.ADiagram.ViewModels;
+using AIStudio.Wpf.DiagramApp.Models;
+using AIStudio.Wpf.DiagramApp.ViewModels;
 using AIStudio.Wpf.Logical.ViewModels;
 using System;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Logical
 {
diff --git a/AIStudio.Wpf.ADiagram/ViewModels/MainWindowViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs
similarity index 99%
rename from AIStudio.Wpf.ADiagram/ViewModels/MainWindowViewModel.cs
rename to AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs
index b58ab72..b01fb48 100644
--- a/AIStudio.Wpf.ADiagram/ViewModels/MainWindowViewModel.cs
+++ b/AIStudio.Wpf.DiagramApp/ViewModels/MainWindowViewModel.cs
@@ -1,4 +1,4 @@
-using AIStudio.Wpf.ADiagram.Views;
+using AIStudio.Wpf.DiagramApp.Views;
 using AIStudio.Wpf.Flowchart;
 using AIStudio.Wpf.Logical;
 using ControlzEx.Theming;
@@ -14,11 +14,11 @@ using System.Reactive.Linq;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
-using Util.DiagramDesigner;
-using AIStudio.Wpf.BaseDiagram.Helpers;
-using AIStudio.Wpf.BaseDiagram.Commands;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramHelper.Helpers;
+using AIStudio.Wpf.DiagramHelper.Commands;
 
-namespace AIStudio.Wpf.ADiagram.ViewModels
+namespace AIStudio.Wpf.DiagramApp.ViewModels
 {
     public class MainWindowViewModel : BindableBase
     {
diff --git a/AIStudio.Wpf.ADiagram/ViewModels/SFCViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/SFCViewModel.cs
similarity index 99%
rename from AIStudio.Wpf.ADiagram/ViewModels/SFCViewModel.cs
rename to AIStudio.Wpf.DiagramApp/ViewModels/SFCViewModel.cs
index a71a1a1..b4a0f23 100644
--- a/AIStudio.Wpf.ADiagram/ViewModels/SFCViewModel.cs
+++ b/AIStudio.Wpf.DiagramApp/ViewModels/SFCViewModel.cs
@@ -1,5 +1,5 @@
-using AIStudio.Wpf.ADiagram.Models;
-using AIStudio.Wpf.ADiagram.ViewModels;
+using AIStudio.Wpf.DiagramApp.Models;
+using AIStudio.Wpf.DiagramApp.ViewModels;
 using AIStudio.Wpf.Flowchart.ViewModels;
 using AIStudio.Wpf.SFC;
 using AIStudio.Wpf.SFC.ViewModels;
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
 using System.Windows.Media;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Flowchart
 {
diff --git a/AIStudio.Wpf.ADiagram/ViewModels/ToolBoxViewModel.cs b/AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs
similarity index 98%
rename from AIStudio.Wpf.ADiagram/ViewModels/ToolBoxViewModel.cs
rename to AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs
index bd838de..f43fccd 100644
--- a/AIStudio.Wpf.ADiagram/ViewModels/ToolBoxViewModel.cs
+++ b/AIStudio.Wpf.DiagramApp/ViewModels/ToolBoxViewModel.cs
@@ -1,7 +1,7 @@
-using AIStudio.Wpf.BaseDiagram.Commands;
-using AIStudio.Wpf.BaseDiagram.Extensions.ViewModels;
-using AIStudio.Wpf.BaseDiagram.Helpers;
-using AIStudio.Wpf.ADiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Commands;
+using AIStudio.Wpf.DiagramHelper.Extensions.ViewModels;
+using AIStudio.Wpf.DiagramHelper.Helpers;
+using AIStudio.Wpf.DiagramApp.Models;
 using AIStudio.Wpf.Flowchart;
 using AIStudio.Wpf.Flowchart.ViewModels;
 using AIStudio.Wpf.Logical.ViewModels;
@@ -11,13 +11,13 @@ using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Windows.Input;
-using Util.DiagramDesigner;
-using Util.DiagramDesigner.Helpers;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner.Helpers;
 using AIStudio.Wpf.SFC;
 using AIStudio.Wpf.SFC.ViewModels;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.ADiagram.ViewModels
+namespace AIStudio.Wpf.DiagramApp.ViewModels
 {
     public class ToolBoxViewModel : BindableBase
     {
diff --git a/AIStudio.Wpf.ADiagram/Views/AboutControl.xaml b/AIStudio.Wpf.DiagramApp/Views/AboutControl.xaml
similarity index 94%
rename from AIStudio.Wpf.ADiagram/Views/AboutControl.xaml
rename to AIStudio.Wpf.DiagramApp/Views/AboutControl.xaml
index 4e4e2d2..4561faa 100644
--- a/AIStudio.Wpf.ADiagram/Views/AboutControl.xaml
+++ b/AIStudio.Wpf.DiagramApp/Views/AboutControl.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="AIStudio.Wpf.ADiagram.Views.AboutControl"
+<UserControl x:Class="AIStudio.Wpf.DiagramApp.Views.AboutControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:AIStudio.Wpf.ADiagram.Views"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramApp.Views"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
@@ -12,7 +12,7 @@
                 <Paragraph>AIStudio.Wpf.Diagram 1.0.0.0
                     <Figure Width="150">
                         <BlockUIContainer>
-                            <Image Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/diagram.png" />
+                            <Image Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/diagram.png" />
                         </BlockUIContainer>
                     </Figure>
                 </Paragraph>
@@ -54,7 +54,7 @@
                     <LineBreak />
                     <Figure Width="150">
                         <BlockUIContainer>
-                            <Image Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/contactme.png" />
+                            <Image Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/contactme.png" />
                         </BlockUIContainer>
                     </Figure>
                     相关链接:
diff --git a/AIStudio.Wpf.ADiagram/Views/AboutControl.xaml.cs b/AIStudio.Wpf.DiagramApp/Views/AboutControl.xaml.cs
similarity index 93%
rename from AIStudio.Wpf.ADiagram/Views/AboutControl.xaml.cs
rename to AIStudio.Wpf.DiagramApp/Views/AboutControl.xaml.cs
index 705045d..16807c9 100644
--- a/AIStudio.Wpf.ADiagram/Views/AboutControl.xaml.cs
+++ b/AIStudio.Wpf.DiagramApp/Views/AboutControl.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace AIStudio.Wpf.ADiagram.Views
+namespace AIStudio.Wpf.DiagramApp.Views
 {
     /// <summary>
     /// AboutControl.xaml 的交互逻辑
diff --git a/AIStudio.Wpf.ADiagram/Views/AboutWindow.xaml b/AIStudio.Wpf.DiagramApp/Views/AboutWindow.xaml
similarity index 66%
rename from AIStudio.Wpf.ADiagram/Views/AboutWindow.xaml
rename to AIStudio.Wpf.DiagramApp/Views/AboutWindow.xaml
index ee04820..2c30e2a 100644
--- a/AIStudio.Wpf.ADiagram/Views/AboutWindow.xaml
+++ b/AIStudio.Wpf.DiagramApp/Views/AboutWindow.xaml
@@ -1,12 +1,12 @@
-<Window x:Class="AIStudio.Wpf.ADiagram.Views.AboutWindow"
+<Window x:Class="AIStudio.Wpf.DiagramApp.Views.AboutWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:AIStudio.Wpf.ADiagram.Views"
+        xmlns:local="clr-namespace:AIStudio.Wpf.DiagramApp.Views"
         mc:Ignorable="d"
-        Icon="/AIStudio.Wpf.ADiagram;component/Icons/App.ico"
-        Title="关于AIStudio.Wpf.ADiagram" 
+        Icon="/AIStudio.Wpf.DiagramApp;component/Icons/App.ico"
+        Title="关于AIStudio.Wpf.DiagramApp" 
         Height="650" Width="900" 
         WindowStartupLocation="CenterScreen" 
         Topmost="True" >
diff --git a/AIStudio.Wpf.ADiagram/Views/AboutWindow.xaml.cs b/AIStudio.Wpf.DiagramApp/Views/AboutWindow.xaml.cs
similarity index 93%
rename from AIStudio.Wpf.ADiagram/Views/AboutWindow.xaml.cs
rename to AIStudio.Wpf.DiagramApp/Views/AboutWindow.xaml.cs
index a368e56..df75634 100644
--- a/AIStudio.Wpf.ADiagram/Views/AboutWindow.xaml.cs
+++ b/AIStudio.Wpf.DiagramApp/Views/AboutWindow.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace AIStudio.Wpf.ADiagram.Views
+namespace AIStudio.Wpf.DiagramApp.Views
 {
     /// <summary>
     /// AboutWindow.xaml 的交互逻辑
diff --git a/AIStudio.Wpf.ADiagram/Views/MainWindow.xaml b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml
similarity index 97%
rename from AIStudio.Wpf.ADiagram/Views/MainWindow.xaml
rename to AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml
index d57e9ce..054448e 100644
--- a/AIStudio.Wpf.ADiagram/Views/MainWindow.xaml
+++ b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml
@@ -1,26 +1,26 @@
-<Fluent:RibbonWindow x:Class="AIStudio.Wpf.ADiagram.MainWindow"
+<Fluent:RibbonWindow x:Class="AIStudio.Wpf.DiagramApp.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:AIStudio.Wpf.ADiagram"
+        xmlns:local="clr-namespace:AIStudio.Wpf.DiagramApp"
         xmlns:Fluent="urn:fluent-ribbon"
         xmlns:utilhandy="https://astudio.github.io/utilcontrol.handy"
-        xmlns:controls="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls;assembly=AIStudio.Wpf.BaseDiagram"
-        xmlns:views="clr-namespace:AIStudio.Wpf.ADiagram.Views"
-        xmlns:binding="clr-namespace:AIStudio.Wpf.BaseDiagram.Commands;assembly=AIStudio.Wpf.BaseDiagram"
+        xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls;assembly=AIStudio.Wpf.DiagramHelper"
+        xmlns:views="clr-namespace:AIStudio.Wpf.DiagramApp.Views"
+        xmlns:binding="clr-namespace:AIStudio.Wpf.DiagramHelper.Commands;assembly=AIStudio.Wpf.DiagramHelper"
         xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
         xmlns:controlzEx="urn:controlzex"
         xmlns:dragablz="http://dragablz.net/winfx/xaml/dragablz"
-        xmlns:helper="clr-namespace:AIStudio.Wpf.BaseDiagram.Helpers;assembly=AIStudio.Wpf.BaseDiagram"
-        xmlns:model="clr-namespace:AIStudio.Wpf.ADiagram.Models"
+        xmlns:helper="clr-namespace:AIStudio.Wpf.DiagramHelper.Helpers;assembly=AIStudio.Wpf.DiagramHelper"
+        xmlns:model="clr-namespace:AIStudio.Wpf.DiagramApp.Models"
         xmlns:dd="https://astudio.github.io/diagram" 
         xmlns:drop="urn:gong-wpf-dragdrop"             
         xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-        xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters;assembly=AIStudio.Wpf.BaseDiagram"
-        xmlns:viewmodel="clr-namespace:AIStudio.Wpf.ADiagram.ViewModels"
+        xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper"
+        xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramApp.ViewModels"
         Style="{StaticResource RibbonWindowStyle}"
-        Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Icons/App.ico"
+        Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Icons/App.ico"
         mc:Ignorable="d"
         Title="AIStudio画板" Height="450" Width="800">
     <Fluent:RibbonWindow.Resources>
@@ -176,7 +176,7 @@
                                                              ToolTip="{Binding Text}"
                                                              Description="{Binding Group}"
                                                              IsDefinitive="True"
-                                                             Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/BlueLarge.png" />
+                                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/BlueLarge.png" />
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
@@ -184,24 +184,24 @@
                         </Fluent:ApplicationMenu.RightPaneContent>
 
                         <Fluent:MenuItem Header="New" Command="{Binding NewCommand}" Size="Small"
-                                         Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/GenericDocument.png"/>
+                                         Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/GenericDocument.png"/>
 
                         <Fluent:MenuItem Header="Save" Command="{Binding SaveCommand}" Size="Small"
-                                         Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/Save.png"/>
+                                         Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/Save.png"/>
 
                         <Fluent:MenuItem Header="Save As" Command="{Binding SaveAsCommand}" Size="Small"
-                                         Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/saveas.png">
+                                         Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/saveas.png">
                         </Fluent:MenuItem>
 
                         <Fluent:MenuItem Header="Open" Command="{Binding OpenCommand}" Size="Small"
                                          Description="CTRL + O"
                                          ToolTip="Open object"
-                                         Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/OpenFolder.png" />
+                                         Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/OpenFolder.png" />
 
                         <Separator />
 
                         <Fluent:MenuItem Header="Exit" Size="Small"
-                                         Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/exit.png"
+                                         Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/exit.png"
                                          Command="{Binding ExitCommand}" />
                     </Fluent:ApplicationMenu>-->
                 </Grid>
@@ -213,7 +213,7 @@
                     <Fluent:Button.ToolTip>
                         <Fluent:ScreenTip Title="Help"
                                           Text="帮助文档"
-                                          Image="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/help.jpg"
+                                          Image="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/help.jpg"
                                           HelpTopic="https://github.com/fluentribbon/Fluent.Ribbon"
                                           Width="190"
                                           IsRibbonAligned="True" />
@@ -229,7 +229,7 @@
                 <Fluent:QuickAccessMenuItem IsChecked="true">
                     <Fluent:Button Header="保存"
                                    Command="{Binding SaveCommand}"
-                                   Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/Save.png" />
+                                   Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/Save.png" />
                 </Fluent:QuickAccessMenuItem>
                 <!-- todo: netcore => was using x:Reference before -->
                 <Fluent:QuickAccessMenuItem Target="{Binding ElementName=pasteButton}"
@@ -295,7 +295,7 @@
                         </Fluent:Button.ToolTip>
                     </Fluent:Button>
                     <Fluent:Button Header="格式化"
-                                   Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/FormatPainter.png"
+                                   Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/FormatPainter.png"
                                    SizeDefinition="Middle,Small" 
                                    Command="{Binding FormatCommand}">
                         <Fluent:Button.ToolTip>
@@ -307,7 +307,7 @@
                     </Fluent:Button>
                     <Fluent:Button x:Name="undoButton"
                                    Header="撤销"
-                                   Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/undo.png"
+                                   Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/undo.png"
                                    SizeDefinition="Middle,Small" 
                                    Command="{Binding DiagramsViewModel.DiagramViewModel.UndoCommand}">
                         <Fluent:Button.ToolTip>
@@ -318,7 +318,7 @@
                     </Fluent:Button>
                     <Fluent:Button x:Name="redoButton"
                                    Header="重做"
-                                   Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/redo.png"
+                                   Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/redo.png"
                                    SizeDefinition="Middle,Small" 
                                    Command="{Binding DiagramsViewModel.DiagramViewModel.RedoCommand}">
                         <Fluent:Button.ToolTip>
@@ -332,7 +332,7 @@
                                        IsLauncherVisible="True"   
                                        DataContext="{Binding FontViewModel}"
                                        x:Name="Font"
-                                       Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/FontColor.png">
+                                       Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/FontColor.png">
                     <Fluent:RibbonToolBar>
                         <!--ToolBar Layout Definitions-->
                         <Fluent:RibbonToolBar.LayoutDefinitions>
@@ -458,7 +458,7 @@
                             </Fluent:ComboBox.ToolTip>
                         </Fluent:ComboBox>
                         <Fluent:Button x:Name="buttonGrowFont"
-                                       Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/GrowFont.png"
+                                       Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/GrowFont.png"
                                        HorizontalAlignment="Left"
                                        SizeDefinition="Small" 
                                        Command="{Binding GrowFontCommand}">
@@ -469,7 +469,7 @@
                             </Fluent:Button.ToolTip>
                         </Fluent:Button>
                         <Fluent:Button x:Name="buttonShrinkFont"
-                                       Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/ShrinkFont.png"
+                                       Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/ShrinkFont.png"
                                        HorizontalAlignment="Left"
                                        SizeDefinition="Small"
                                        Command="{Binding ShrinkFontCommand}">
@@ -480,7 +480,7 @@
                             </Fluent:Button.ToolTip>
                         </Fluent:Button>
                         <Fluent:DropDownButton x:Name="buttonChangeCase"
-                                               Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/ChangeCase.png"
+                                               Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/ChangeCase.png"
                                                HorizontalAlignment="Left"
                                                SizeDefinition="Small" >
                             <Fluent:MenuItem Header="正常" Size="Middle" IsCheckable="True" IsChecked="{Binding FontCase,Converter={converter:ConverterValueMapToBool Parameter='None'}, ConverterParameter='None'}"  />
@@ -493,7 +493,7 @@
                             </Fluent:DropDownButton.ToolTip>
                         </Fluent:DropDownButton>
                         <Fluent:Button x:Name="buttonClearFormatting"
-                                       Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/ClearFormatting.png"
+                                       Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/ClearFormatting.png"
                                        HorizontalAlignment="Left"
                                        SizeDefinition="Small"
                                        Command="{Binding ClearFormattingCommand}">
@@ -608,7 +608,7 @@
                             </Fluent:DropDownButton.ToolTip>
                         </Fluent:DropDownButton>
                         <Fluent:ToggleButton x:Name="buttonBold"
-                                             Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/Bold.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/Bold.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
                                              IsChecked="{Binding FontWeight,Converter={converter:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}">
@@ -619,7 +619,7 @@
                             </Fluent:ToggleButton.ToolTip>
                         </Fluent:ToggleButton>
                         <Fluent:ToggleButton x:Name="buttonItalic"
-                                             Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/Italic.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/Italic.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
                                              IsChecked="{Binding FontStyle,Converter={converter:ConverterValueMapToBool Parameter='Normal'}, ConverterParameter='Italic'}">
@@ -630,7 +630,7 @@
                             </Fluent:ToggleButton.ToolTip>
                         </Fluent:ToggleButton>
                         <Fluent:ToggleButton x:Name="buttonUnderline"
-                                             Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/Underline.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/Underline.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
                                              IsChecked="{Binding Underline}">
@@ -641,7 +641,7 @@
                             </Fluent:ToggleButton.ToolTip>
                         </Fluent:ToggleButton>
                         <Fluent:ToggleButton x:Name="buttonStrikethrough" 
-                                             Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/Strikethrough.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/Strikethrough.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
                                              IsChecked="{Binding Strikethrough}">
@@ -652,7 +652,7 @@
                             </Fluent:ToggleButton.ToolTip>
                         </Fluent:ToggleButton>
                         <Fluent:Button x:Name="buttonSubscript"
-                                       Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/Subscript.png"
+                                       Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/Subscript.png"
                                        HorizontalAlignment="Left"
                                        SizeDefinition="Small" >
                             <Fluent:Button.ToolTip>
@@ -662,7 +662,7 @@
                             </Fluent:Button.ToolTip>
                         </Fluent:Button>
                         <Fluent:Button x:Name="buttonSuperscript"
-                                       Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/Superscript.png"
+                                       Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/Superscript.png"
                                        HorizontalAlignment="Left"
                                        SizeDefinition="Small" >
                             <Fluent:Button.ToolTip>
@@ -672,7 +672,7 @@
                             </Fluent:Button.ToolTip>
                         </Fluent:Button>
                         <Fluent:DropDownButton x:Name="buttonLineHeight"
-                                               Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/line-height.png"
+                                               Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/line-height.png"
                                                HorizontalAlignment="Left"
                                                SizeDefinition="Small" >
                             <Fluent:MenuItem Header="1.0" Size="Middle" IsCheckable="True" IsChecked="{Binding LineHeight,Converter={converter:ConverterValueMapToBool Parameter='12'}, ConverterParameter='12'}"  />
@@ -695,7 +695,7 @@
                                             SizeDefinition="Small">
                             <Fluent:SplitButton.Icon>
                                 <Grid>
-                                    <Image Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/TextEffects.png"
+                                    <Image Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/TextEffects.png"
                                            Width="16"
                                            Height="16" />
                                     <Rectangle VerticalAlignment="Bottom"
@@ -725,7 +725,7 @@
                                             SizeDefinition="Small">
                             <Fluent:SplitButton.Icon>
                                 <Grid>
-                                    <Image Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/TextHighlightColor.png"
+                                    <Image Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/TextHighlightColor.png"
                                            Width="16"
                                            Height="16" />
                                     <Rectangle VerticalAlignment="Bottom"
@@ -757,7 +757,7 @@
                                             MaxDropDownHeight="500">
                             <Fluent:DropDownButton.Icon>
                                 <Grid>
-                                    <Image Source="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/FontColor.png"
+                                    <Image Source="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/FontColor.png"
                                            Width="16"
                                            Height="16"
                                            SnapsToDevicePixels="True" />
@@ -929,17 +929,17 @@
                         <Fluent:DropDownButton.LargeIcon>
                             <iconPacks:PackIconMaterial Kind="LayersOutline" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Fluent:DropDownButton.LargeIcon>
-                        <Fluent:Button Margin="5" Header="置于顶层" Command="{Binding BringToFrontCommand}" Size="Middle" Icon="/AIStudio.Wpf.ADiagram;component/Images/BringToFront.png"/>
-                        <Fluent:Button Margin="5" Header="置于底层" Command="{Binding SendToBackCommand}" Size="Middle" Icon="/AIStudio.Wpf.ADiagram;component/Images/SendToBack.png"/>
-                        <Fluent:Button Margin="5" Header="上移一层" Command="{Binding BringForwardCommand}" Size="Middle" Icon="/AIStudio.Wpf.ADiagram;component/Images/BringForward.png"/>
-                        <Fluent:Button Margin="5" Header="下移一层" Command="{Binding SendBackwardCommand}" Size="Middle" Icon="/AIStudio.Wpf.ADiagram;component/Images/SendBackward.png"/>
+                        <Fluent:Button Margin="5" Header="置于顶层" Command="{Binding BringToFrontCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/BringToFront.png"/>
+                        <Fluent:Button Margin="5" Header="置于底层" Command="{Binding SendToBackCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/SendToBack.png"/>
+                        <Fluent:Button Margin="5" Header="上移一层" Command="{Binding BringForwardCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/BringForward.png"/>
+                        <Fluent:Button Margin="5" Header="下移一层" Command="{Binding SendBackwardCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/SendBackward.png"/>
                     </Fluent:DropDownButton>
                     <Fluent:DropDownButton Header="组合" Icon="{iconPacks:Material Kind=Group}" Width="50" VerticalAlignment="Top">
                         <Fluent:DropDownButton.LargeIcon>
                             <iconPacks:PackIconMaterial Kind="Group" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                         </Fluent:DropDownButton.LargeIcon>
-                        <Fluent:Button Margin="5" Header="组合" Command="{Binding GroupCommand}" Size="Middle" Icon="/AIStudio.Wpf.ADiagram;component/Images/BringForward.png"/>
-                        <Fluent:Button Margin="5" Header="取消组合" Command="{Binding UngroupCommand}" Size="Middle" Icon="/AIStudio.Wpf.ADiagram;component/Images/SendBackward.png"/>
+                        <Fluent:Button Margin="5" Header="组合" Command="{Binding GroupCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/BringForward.png"/>
+                        <Fluent:Button Margin="5" Header="取消组合" Command="{Binding UngroupCommand}" Size="Middle" Icon="/AIStudio.Wpf.DiagramApp;component/Images/SendBackward.png"/>
                     </Fluent:DropDownButton>
                     <Fluent:DropDownButton Header="对齐" Icon="{iconPacks:Material Kind=AlignHorizontalLeft}" Width="50" VerticalAlignment="Top">
                         <Fluent:DropDownButton.LargeIcon>
@@ -947,20 +947,20 @@
                         </Fluent:DropDownButton.LargeIcon>
                         <TextBlock Margin="5" Text="对齐"/>
                         <StackPanel Orientation="Horizontal">
-                            <Fluent:Button Margin="5" Command="{Binding AlignLeftCommand}" Size="Small" Icon="/AIStudio.Wpf.ADiagram;component/Images/AlignObjectsLeft.png"/>
-                            <Fluent:Button Margin="5" Command="{Binding AlignHorizontalCentersCommand}" Size="Small" Icon="/AIStudio.Wpf.ADiagram;component/Images/AlignObjectsCenteredHorizontal.png"/>
-                            <Fluent:Button Margin="5" Command="{Binding AlignRightCommand}" Size="Small" Icon="/AIStudio.Wpf.ADiagram;component/Images/AlignObjectsRight.png"/>
+                            <Fluent:Button Margin="5" Command="{Binding AlignLeftCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsLeft.png"/>
+                            <Fluent:Button Margin="5" Command="{Binding AlignHorizontalCentersCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsCenteredHorizontal.png"/>
+                            <Fluent:Button Margin="5" Command="{Binding AlignRightCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsRight.png"/>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
-                            <Fluent:Button Margin="5" Command="{Binding AlignTopCommand}" Size="Small" Icon="/AIStudio.Wpf.ADiagram;component/Images/AlignObjectsTop.png"/>
-                            <Fluent:Button Margin="5" Command="{Binding AlignVerticalCentersCommand}" Size="Small" Icon="/AIStudio.Wpf.ADiagram;component/Images/AlignObjectsCenteredVertical.png"/>
-                            <Fluent:Button Margin="5" Command="{Binding AlignBottomCommand}" Size="Small" Icon="/AIStudio.Wpf.ADiagram;component/Images/AlignObjectsBottom.png"/>
+                            <Fluent:Button Margin="5" Command="{Binding AlignTopCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsTop.png"/>
+                            <Fluent:Button Margin="5" Command="{Binding AlignVerticalCentersCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsCenteredVertical.png"/>
+                            <Fluent:Button Margin="5" Command="{Binding AlignBottomCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/AlignObjectsBottom.png"/>
                         </StackPanel>
                         <Separator />
                         <TextBlock Margin="5" Text="等距分布"/>
                         <StackPanel Orientation="Horizontal">
-                            <Fluent:Button Margin="5" Command="{Binding DistributeHorizontalCommand}" Size="Small" Icon="/AIStudio.Wpf.ADiagram;component/Images/DistributeObjectsHorizontal.png"/>
-                            <Fluent:Button Margin="5" Command="{Binding DistributeVerticalCommand}" Size="Small" Icon="/AIStudio.Wpf.ADiagram;component/Images/DistributeObjectsVertical.png"/>
+                            <Fluent:Button Margin="5" Command="{Binding DistributeHorizontalCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/DistributeObjectsHorizontal.png"/>
+                            <Fluent:Button Margin="5" Command="{Binding DistributeVerticalCommand}" Size="Small" Icon="/AIStudio.Wpf.DiagramApp;component/Images/DistributeObjectsVertical.png"/>
                         </StackPanel>
                     </Fluent:DropDownButton>
                     <Fluent:DropDownButton Header="翻转" Icon="{iconPacks:VaadinIcons Kind=FlipH}" Width="50" VerticalAlignment="Top" IsEnabled="{Binding SelectedItem.ShowRotate}">
@@ -1094,7 +1094,7 @@
                         </Fluent:SplitButton.ToolTip>
                     </Fluent:SplitButton>
 
-                    <Fluent:DropDownButton Header="样式" SizeDefinition="Middle" MaxDropDownHeight="500" Icon="pack://application:,,,/AIStudio.Wpf.ADiagram;component/Images/line-dashed.png">
+                    <Fluent:DropDownButton Header="样式" SizeDefinition="Middle" MaxDropDownHeight="500" Icon="pack://application:,,,/AIStudio.Wpf.DiagramApp;component/Images/line-dashed.png">
                         <TextBlock Text="线条样式" FontSize="16" FontWeight="Black" Margin="5"/>
                         <StackPanel Orientation="Horizontal">
                             <StackPanel>
diff --git a/AIStudio.Wpf.ADiagram/Views/MainWindow.xaml.cs b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml.cs
similarity index 97%
rename from AIStudio.Wpf.ADiagram/Views/MainWindow.xaml.cs
rename to AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml.cs
index 6d8b7ac..a645d8e 100644
--- a/AIStudio.Wpf.ADiagram/Views/MainWindow.xaml.cs
+++ b/AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml.cs
@@ -13,13 +13,13 @@ using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using AIStudio.Wpf.ADiagram.ViewModels;
+using AIStudio.Wpf.DiagramApp.ViewModels;
 using ControlzEx.Theming;
 using Fluent;
 using Fluent.Localization;
 using Button = Fluent.Button;
 
-namespace AIStudio.Wpf.ADiagram
+namespace AIStudio.Wpf.DiagramApp
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
diff --git a/AIStudio.Wpf.ADiagram/Views/PropertyControl.xaml b/AIStudio.Wpf.DiagramApp/Views/PropertyControl.xaml
similarity index 98%
rename from AIStudio.Wpf.ADiagram/Views/PropertyControl.xaml
rename to AIStudio.Wpf.DiagramApp/Views/PropertyControl.xaml
index 00ae0e0..eccc973 100644
--- a/AIStudio.Wpf.ADiagram/Views/PropertyControl.xaml
+++ b/AIStudio.Wpf.DiagramApp/Views/PropertyControl.xaml
@@ -1,13 +1,13 @@
-<UserControl x:Class="AIStudio.Wpf.ADiagram.Views.PropertyControl"
+<UserControl x:Class="AIStudio.Wpf.DiagramApp.Views.PropertyControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:Fluent="urn:fluent-ribbon"
-             xmlns:controls="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls;assembly=AIStudio.Wpf.BaseDiagram"
-             xmlns:views="clr-namespace:AIStudio.Wpf.ADiagram.Views"
-             xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters;assembly=AIStudio.Wpf.BaseDiagram"
-             xmlns:helper="clr-namespace:AIStudio.Wpf.BaseDiagram.Helpers;assembly=AIStudio.Wpf.BaseDiagram"
+             xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls;assembly=AIStudio.Wpf.DiagramHelper"
+             xmlns:views="clr-namespace:AIStudio.Wpf.DiagramApp.Views"
+             xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper"
+             xmlns:helper="clr-namespace:AIStudio.Wpf.DiagramHelper.Helpers;assembly=AIStudio.Wpf.DiagramHelper"
              xmlns:dd="https://astudio.github.io/diagram"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:flowchart="clr-namespace:AIStudio.Wpf.Flowchart;assembly=AIStudio.Wpf.Flowchart"
diff --git a/AIStudio.Wpf.ADiagram/Views/PropertyControl.xaml.cs b/AIStudio.Wpf.DiagramApp/Views/PropertyControl.xaml.cs
similarity index 87%
rename from AIStudio.Wpf.ADiagram/Views/PropertyControl.xaml.cs
rename to AIStudio.Wpf.DiagramApp/Views/PropertyControl.xaml.cs
index 75ddea8..4899303 100644
--- a/AIStudio.Wpf.ADiagram/Views/PropertyControl.xaml.cs
+++ b/AIStudio.Wpf.DiagramApp/Views/PropertyControl.xaml.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace AIStudio.Wpf.ADiagram.Views
+namespace AIStudio.Wpf.DiagramApp.Views
 {
     /// <summary>
     /// PropertyControl.xaml 的交互逻辑
diff --git a/AIStudio.Wpf.ADiagram/Views/ToolBoxControl.xaml b/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml
similarity index 97%
rename from AIStudio.Wpf.ADiagram/Views/ToolBoxControl.xaml
rename to AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml
index 55b561f..6c93e7b 100644
--- a/AIStudio.Wpf.ADiagram/Views/ToolBoxControl.xaml
+++ b/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml
@@ -1,14 +1,14 @@
-<UserControl x:Class="AIStudio.Wpf.ADiagram.Views.ToolBoxControl"
+<UserControl x:Class="AIStudio.Wpf.DiagramApp.Views.ToolBoxControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:views="clr-namespace:AIStudio.Wpf.ADiagram.Views"
-             xmlns:viewmodels="clr-namespace:AIStudio.Wpf.ADiagram.ViewModels"
-             xmlns:model="clr-namespace:AIStudio.Wpf.ADiagram.Models"
+             xmlns:views="clr-namespace:AIStudio.Wpf.DiagramApp.Views"
+             xmlns:viewmodels="clr-namespace:AIStudio.Wpf.DiagramApp.ViewModels"
+             xmlns:model="clr-namespace:AIStudio.Wpf.DiagramApp.Models"
              xmlns:dd="https://astudio.github.io/diagram" 
-             xmlns:conventer="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters;assembly=AIStudio.Wpf.BaseDiagram"
-             xmlns:command="clr-namespace:AIStudio.Wpf.BaseDiagram.Commands;assembly=AIStudio.Wpf.BaseDiagram"
+             xmlns:conventer="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper"
+             xmlns:command="clr-namespace:AIStudio.Wpf.DiagramHelper.Commands;assembly=AIStudio.Wpf.DiagramHelper"
              xmlns:svg="clr-namespace:Svg2XamlTestExtension;assembly=Svg2XamlTestExtension"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
diff --git a/AIStudio.Wpf.ADiagram/Views/ToolBoxControl.xaml.cs b/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml.cs
similarity index 96%
rename from AIStudio.Wpf.ADiagram/Views/ToolBoxControl.xaml.cs
rename to AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml.cs
index 318e2dc..7ea9d35 100644
--- a/AIStudio.Wpf.ADiagram/Views/ToolBoxControl.xaml.cs
+++ b/AIStudio.Wpf.DiagramApp/Views/ToolBoxControl.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace AIStudio.Wpf.ADiagram.Views
+namespace AIStudio.Wpf.DiagramApp.Views
 {
     /// <summary>
     /// ToolBoxControl.xaml 的交互逻辑
diff --git a/Util.DiagramDesigner/Util.DiagramDesigner.csproj b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj
similarity index 94%
rename from Util.DiagramDesigner/Util.DiagramDesigner.csproj
rename to AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj
index 3178d33..8a69c51 100644
--- a/Util.DiagramDesigner/Util.DiagramDesigner.csproj
+++ b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
diff --git a/Util.DiagramDesigner/Adorners/RubberbandAdorner.cs b/AIStudio.Wpf.DiagramDesigner/Adorners/RubberbandAdorner.cs
similarity index 99%
rename from Util.DiagramDesigner/Adorners/RubberbandAdorner.cs
rename to AIStudio.Wpf.DiagramDesigner/Adorners/RubberbandAdorner.cs
index 8fa6c5d..2466d20 100644
--- a/Util.DiagramDesigner/Adorners/RubberbandAdorner.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Adorners/RubberbandAdorner.cs
@@ -7,7 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class RubberbandAdorner : Adorner
     {
diff --git a/Util.DiagramDesigner/AttachedProperties/DragAndDropProps.cs b/AIStudio.Wpf.DiagramDesigner/AttachedProperties/DragAndDropProps.cs
similarity index 97%
rename from Util.DiagramDesigner/AttachedProperties/DragAndDropProps.cs
rename to AIStudio.Wpf.DiagramDesigner/AttachedProperties/DragAndDropProps.cs
index f260d89..941966b 100644
--- a/Util.DiagramDesigner/AttachedProperties/DragAndDropProps.cs
+++ b/AIStudio.Wpf.DiagramDesigner/AttachedProperties/DragAndDropProps.cs
@@ -6,9 +6,9 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Input;
-using Util.DiagramDesigner.Helpers;
+using AIStudio.Wpf.DiagramDesigner.Helpers;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public static class DragAndDropProps     
     {
diff --git a/Util.DiagramDesigner/AttachedProperties/ItemConnectProps.cs b/AIStudio.Wpf.DiagramDesigner/AttachedProperties/ItemConnectProps.cs
similarity index 97%
rename from Util.DiagramDesigner/AttachedProperties/ItemConnectProps.cs
rename to AIStudio.Wpf.DiagramDesigner/AttachedProperties/ItemConnectProps.cs
index bf26925..4ec48e6 100644
--- a/Util.DiagramDesigner/AttachedProperties/ItemConnectProps.cs
+++ b/AIStudio.Wpf.DiagramDesigner/AttachedProperties/ItemConnectProps.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Input;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public static class ItemConnectProps
     {
diff --git a/Util.DiagramDesigner/AttachedProperties/SelectionProps.cs b/AIStudio.Wpf.DiagramDesigner/AttachedProperties/SelectionProps.cs
similarity index 98%
rename from Util.DiagramDesigner/AttachedProperties/SelectionProps.cs
rename to AIStudio.Wpf.DiagramDesigner/AttachedProperties/SelectionProps.cs
index 7f4c2be..a1ccf0d 100644
--- a/Util.DiagramDesigner/AttachedProperties/SelectionProps.cs
+++ b/AIStudio.Wpf.DiagramDesigner/AttachedProperties/SelectionProps.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Input;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public static class SelectionProps  
     {
diff --git a/Util.DiagramDesigner/Attributes/CanDoAttribute.cs b/AIStudio.Wpf.DiagramDesigner/Attributes/CanDoAttribute.cs
similarity index 82%
rename from Util.DiagramDesigner/Attributes/CanDoAttribute.cs
rename to AIStudio.Wpf.DiagramDesigner/Attributes/CanDoAttribute.cs
index afd2603..005242f 100644
--- a/Util.DiagramDesigner/Attributes/CanDoAttribute.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Attributes/CanDoAttribute.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     [AttributeUsage(AttributeTargets.Property)]
     public class CanDoAttribute : Attribute
diff --git a/Util.DiagramDesigner/Controls/BorderResizeThumb.cs b/AIStudio.Wpf.DiagramDesigner/Controls/BorderResizeThumb.cs
similarity index 99%
rename from Util.DiagramDesigner/Controls/BorderResizeThumb.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/BorderResizeThumb.cs
index 01c512c..c79d70b 100644
--- a/Util.DiagramDesigner/Controls/BorderResizeThumb.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/BorderResizeThumb.cs
@@ -6,7 +6,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Controls
 {
     public class BorderResizeThumb : Thumb
     {
diff --git a/Util.DiagramDesigner/Controls/CinchMenuItem.cs b/AIStudio.Wpf.DiagramDesigner/Controls/CinchMenuItem.cs
similarity index 98%
rename from Util.DiagramDesigner/Controls/CinchMenuItem.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/CinchMenuItem.cs
index 8821fc5..08f6515 100644
--- a/Util.DiagramDesigner/Controls/CinchMenuItem.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/CinchMenuItem.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// Provides a mechanism for constructing MenuItems
diff --git a/Util.DiagramDesigner/Controls/Connector.cs b/AIStudio.Wpf.DiagramDesigner/Controls/Connector.cs
similarity index 96%
rename from Util.DiagramDesigner/Controls/Connector.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/Connector.cs
index 8b03579..9762412 100644
--- a/Util.DiagramDesigner/Controls/Connector.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/Connector.cs
@@ -7,7 +7,7 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class Connector : Control
     {
diff --git a/Util.DiagramDesigner/Controls/DesignerCanvas.cs b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
similarity index 99%
rename from Util.DiagramDesigner/Controls/DesignerCanvas.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
index 9cdfd4b..fa66d47 100644
--- a/Util.DiagramDesigner/Controls/DesignerCanvas.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
@@ -13,7 +13,7 @@ using System.Windows.Shapes;
 using System.Windows.Resources;
 using System.Runtime.InteropServices;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class DesignerCanvas : Canvas
     {
@@ -138,7 +138,7 @@ namespace Util.DiagramDesigner
         #region Format/Move
         private void EnterFormat()
         {
-            StreamResourceInfo sri = Application.GetResourceStream(new Uri("pack://application:,,,/Util.DiagramDesigner;component/Images/FormatPainter.cur", UriKind.RelativeOrAbsolute));
+            StreamResourceInfo sri = Application.GetResourceStream(new Uri("pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Images/FormatPainter.cur", UriKind.RelativeOrAbsolute));
             this.Cursor = new Cursor(sri.Stream);
             foreach (SelectableDesignerItemViewModelBase item in _viewModel.Items)
             {
diff --git a/Util.DiagramDesigner/Controls/DragThumb.cs b/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
similarity index 98%
rename from Util.DiagramDesigner/Controls/DragThumb.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
index cd41384..e188b0b 100644
--- a/Util.DiagramDesigner/Controls/DragThumb.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
@@ -7,7 +7,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Controls
 {
     public class DragThumb : Thumb
     {
diff --git a/Util.DiagramDesigner/Controls/PointConnector.cs b/AIStudio.Wpf.DiagramDesigner/Controls/PointConnector.cs
similarity index 88%
rename from Util.DiagramDesigner/Controls/PointConnector.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/PointConnector.cs
index 0573e9f..2164f53 100644
--- a/Util.DiagramDesigner/Controls/PointConnector.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/PointConnector.cs
@@ -7,7 +7,7 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class PointConnector : Control
     {
diff --git a/Util.DiagramDesigner/Controls/PointDragThumb.cs b/AIStudio.Wpf.DiagramDesigner/Controls/PointDragThumb.cs
similarity index 96%
rename from Util.DiagramDesigner/Controls/PointDragThumb.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/PointDragThumb.cs
index fe2e584..57b0fff 100644
--- a/Util.DiagramDesigner/Controls/PointDragThumb.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/PointDragThumb.cs
@@ -7,7 +7,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Controls
 {
     public class PointDragThumb : Thumb
     {
diff --git a/Util.DiagramDesigner/Controls/RelativePositionPanel.cs b/AIStudio.Wpf.DiagramDesigner/Controls/RelativePositionPanel.cs
similarity index 98%
rename from Util.DiagramDesigner/Controls/RelativePositionPanel.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/RelativePositionPanel.cs
index 93b7306..ddeffa8 100644
--- a/Util.DiagramDesigner/Controls/RelativePositionPanel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/RelativePositionPanel.cs
@@ -6,7 +6,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class RelativePositionPanel : Panel
     {
diff --git a/Util.DiagramDesigner/Controls/ResizeThumb.cs b/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs
similarity index 99%
rename from Util.DiagramDesigner/Controls/ResizeThumb.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs
index 41bbff2..e382535 100644
--- a/Util.DiagramDesigner/Controls/ResizeThumb.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs
@@ -6,7 +6,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Controls
 {
     public class ResizeThumb : Thumb
     {
diff --git a/Util.DiagramDesigner/Controls/RotateThumb.cs b/AIStudio.Wpf.DiagramDesigner/Controls/RotateThumb.cs
similarity index 98%
rename from Util.DiagramDesigner/Controls/RotateThumb.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/RotateThumb.cs
index fe56ca2..1b8be68 100644
--- a/Util.DiagramDesigner/Controls/RotateThumb.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/RotateThumb.cs
@@ -7,7 +7,7 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner.Controls
+namespace AIStudio.Wpf.DiagramDesigner.Controls
 {
     public class RotateThumb : Thumb
     {
diff --git a/Util.DiagramDesigner/Controls/ZoomBox.cs b/AIStudio.Wpf.DiagramDesigner/Controls/ZoomBox.cs
similarity index 99%
rename from Util.DiagramDesigner/Controls/ZoomBox.cs
rename to AIStudio.Wpf.DiagramDesigner/Controls/ZoomBox.cs
index 86bc3f5..ee22e24 100644
--- a/Util.DiagramDesigner/Controls/ZoomBox.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/ZoomBox.cs
@@ -5,7 +5,7 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 using System.Windows.Input;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ZoomBox : Control
     {
diff --git a/Util.DiagramDesigner/Converters/ArrowPathConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ArrowPathConverter.cs
similarity index 94%
rename from Util.DiagramDesigner/Converters/ArrowPathConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/ArrowPathConverter.cs
index ddd77fc..2efde8c 100644
--- a/Util.DiagramDesigner/Converters/ArrowPathConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ArrowPathConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Data;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
 
     public class ArrowPathConverter : IValueConverter
diff --git a/Util.DiagramDesigner/Converters/ArrowSizeConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ArrowSizeConverter.cs
similarity index 93%
rename from Util.DiagramDesigner/Converters/ArrowSizeConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/ArrowSizeConverter.cs
index 2c4a040..3bc1ba4 100644
--- a/Util.DiagramDesigner/Converters/ArrowSizeConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ArrowSizeConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Data;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ArrowSizeConverter : IValueConverter
     {
diff --git a/Util.DiagramDesigner/Converters/BoolToVisibilityConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/BoolToVisibilityConverter.cs
similarity index 96%
rename from Util.DiagramDesigner/Converters/BoolToVisibilityConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/BoolToVisibilityConverter.cs
index e0ac082..90aa640 100644
--- a/Util.DiagramDesigner/Converters/BoolToVisibilityConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/BoolToVisibilityConverter.cs
@@ -7,7 +7,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     [ValueConversion(typeof(bool), typeof(Visibility))]
     public class BoolToVisibilityConverter : IValueConverter
diff --git a/Util.DiagramDesigner/Converters/ClipConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ClipConverter.cs
similarity index 99%
rename from Util.DiagramDesigner/Converters/ClipConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/ClipConverter.cs
index 13ffbfc..8c5aadd 100644
--- a/Util.DiagramDesigner/Converters/ClipConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ClipConverter.cs
@@ -5,7 +5,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ClipConverter : IValueConverter
     {
diff --git a/Util.DiagramDesigner/Converters/ColorBrushConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ColorBrushConverter.cs
similarity index 99%
rename from Util.DiagramDesigner/Converters/ColorBrushConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/ColorBrushConverter.cs
index a30ae33..32616c2 100644
--- a/Util.DiagramDesigner/Converters/ColorBrushConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ColorBrushConverter.cs
@@ -8,7 +8,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ColorBrushConverter : IValueConverter
     {
diff --git a/Util.DiagramDesigner/Converters/ConectorOrientationConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConectorOrientationConverter.cs
similarity index 91%
rename from Util.DiagramDesigner/Converters/ConectorOrientationConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/ConectorOrientationConverter.cs
index 4d1ae4d..f42175d 100644
--- a/Util.DiagramDesigner/Converters/ConectorOrientationConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConectorOrientationConverter.cs
@@ -1,4 +1,4 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,7 +8,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ConectorOrientationConverter : IValueConverter
     {
diff --git a/Util.DiagramDesigner/Converters/ConectorValueConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConectorValueConverter.cs
similarity index 94%
rename from Util.DiagramDesigner/Converters/ConectorValueConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/ConectorValueConverter.cs
index c4d1f8f..9be5f2f 100644
--- a/Util.DiagramDesigner/Converters/ConectorValueConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConectorValueConverter.cs
@@ -1,4 +1,4 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,7 +8,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ConectorValueConverter : IMultiValueConverter
     {
diff --git a/Util.DiagramDesigner/Converters/ConnectionDataConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConnectionDataConverter.cs
similarity index 98%
rename from Util.DiagramDesigner/Converters/ConnectionDataConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/ConnectionDataConverter.cs
index f180364..5050d15 100644
--- a/Util.DiagramDesigner/Converters/ConnectionDataConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConnectionDataConverter.cs
@@ -8,7 +8,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ConnectionDataConverter : IMultiValueConverter
     {
diff --git a/Util.DiagramDesigner/Converters/ConnectionPathConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ConnectionPathConverter.cs
similarity index 97%
rename from Util.DiagramDesigner/Converters/ConnectionPathConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/ConnectionPathConverter.cs
index ebc567b..ba2f686 100644
--- a/Util.DiagramDesigner/Converters/ConnectionPathConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ConnectionPathConverter.cs
@@ -7,7 +7,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     [ValueConversion(typeof(List<Point>), typeof(PathSegmentCollection))]
     public class ConnectionPathConverter : IValueConverter
diff --git a/Util.DiagramDesigner/Converters/DoubleToThickness.cs b/AIStudio.Wpf.DiagramDesigner/Converters/DoubleToThickness.cs
similarity index 98%
rename from Util.DiagramDesigner/Converters/DoubleToThickness.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/DoubleToThickness.cs
index b00baab..ad6dc12 100644
--- a/Util.DiagramDesigner/Converters/DoubleToThickness.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/DoubleToThickness.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class DoubleToThickness : IValueConverter
     {
diff --git a/Util.DiagramDesigner/Converters/EnumDescriptionConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/EnumDescriptionConverter.cs
similarity index 96%
rename from Util.DiagramDesigner/Converters/EnumDescriptionConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/EnumDescriptionConverter.cs
index 3bc6a50..ffb05bc 100644
--- a/Util.DiagramDesigner/Converters/EnumDescriptionConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/EnumDescriptionConverter.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Windows.Data;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class EnumDescriptionConverter : IValueConverter
     {
diff --git a/Util.DiagramDesigner/Converters/ImageUrlConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/ImageUrlConverter.cs
similarity index 96%
rename from Util.DiagramDesigner/Converters/ImageUrlConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/ImageUrlConverter.cs
index c09b072..8740cd0 100644
--- a/Util.DiagramDesigner/Converters/ImageUrlConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/ImageUrlConverter.cs
@@ -6,7 +6,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     [ValueConversion(typeof(string), typeof(ImageSource))]
     public class ImageUrlConverter : IValueConverter
diff --git a/Util.DiagramDesigner/Converters/InvertBoolConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/InvertBoolConverter.cs
similarity index 96%
rename from Util.DiagramDesigner/Converters/InvertBoolConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/InvertBoolConverter.cs
index 365c3cd..df5d908 100644
--- a/Util.DiagramDesigner/Converters/InvertBoolConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/InvertBoolConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class InvertBoolConverter : MarkupExtension, IValueConverter
     {
diff --git a/Util.DiagramDesigner/Converters/LineDashConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/LineDashConverter.cs
similarity index 94%
rename from Util.DiagramDesigner/Converters/LineDashConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/LineDashConverter.cs
index c8ef45c..1dad570 100644
--- a/Util.DiagramDesigner/Converters/LineDashConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/LineDashConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Data;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
 
     public class LineDashConverter : IValueConverter
diff --git a/Util.DiagramDesigner/Converters/TrueToFalseConverter.cs b/AIStudio.Wpf.DiagramDesigner/Converters/TrueToFalseConverter.cs
similarity index 93%
rename from Util.DiagramDesigner/Converters/TrueToFalseConverter.cs
rename to AIStudio.Wpf.DiagramDesigner/Converters/TrueToFalseConverter.cs
index e198edf..45e8b5c 100644
--- a/Util.DiagramDesigner/Converters/TrueToFalseConverter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Converters/TrueToFalseConverter.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// 这是一个颠倒黑白的世界
diff --git a/Util.DiagramDesigner/Enums/ArrowPathStyle.cs b/AIStudio.Wpf.DiagramDesigner/Enums/ArrowPathStyle.cs
similarity index 88%
rename from Util.DiagramDesigner/Enums/ArrowPathStyle.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/ArrowPathStyle.cs
index 4dfe3b8..9343a04 100644
--- a/Util.DiagramDesigner/Enums/ArrowPathStyle.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/ArrowPathStyle.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum ArrowPathStyle
     {
diff --git a/Util.DiagramDesigner/Enums/ArrowSizeStyle.cs b/AIStudio.Wpf.DiagramDesigner/Enums/ArrowSizeStyle.cs
similarity index 92%
rename from Util.DiagramDesigner/Enums/ArrowSizeStyle.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/ArrowSizeStyle.cs
index aaf56d7..d295695 100644
--- a/Util.DiagramDesigner/Enums/ArrowSizeStyle.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/ArrowSizeStyle.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum ArrowSizeStyle
     {
diff --git a/Util.DiagramDesigner/Enums/BrushType.cs b/AIStudio.Wpf.DiagramDesigner/Enums/BrushType.cs
similarity index 88%
rename from Util.DiagramDesigner/Enums/BrushType.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/BrushType.cs
index daed008..67f7239 100644
--- a/Util.DiagramDesigner/Enums/BrushType.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/BrushType.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum BrushType
     {
diff --git a/Util.DiagramDesigner/Enums/CellHorizontalAlignment.cs b/AIStudio.Wpf.DiagramDesigner/Enums/CellHorizontalAlignment.cs
similarity index 88%
rename from Util.DiagramDesigner/Enums/CellHorizontalAlignment.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/CellHorizontalAlignment.cs
index 8ef5592..f2840db 100644
--- a/Util.DiagramDesigner/Enums/CellHorizontalAlignment.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/CellHorizontalAlignment.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum CellHorizontalAlignment
     {
diff --git a/Util.DiagramDesigner/Enums/ConnectorOrientation.cs b/AIStudio.Wpf.DiagramDesigner/Enums/ConnectorOrientation.cs
similarity index 84%
rename from Util.DiagramDesigner/Enums/ConnectorOrientation.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/ConnectorOrientation.cs
index 79fc79b..de516d8 100644
--- a/Util.DiagramDesigner/Enums/ConnectorOrientation.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/ConnectorOrientation.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum ConnectorOrientation
     {
diff --git a/Util.DiagramDesigner/Enums/CursorMode.cs b/AIStudio.Wpf.DiagramDesigner/Enums/CursorMode.cs
similarity index 81%
rename from Util.DiagramDesigner/Enums/CursorMode.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/CursorMode.cs
index cff11d2..b33abc2 100644
--- a/Util.DiagramDesigner/Enums/CursorMode.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/CursorMode.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum CursorMode
     {
diff --git a/Util.DiagramDesigner/Enums/DiagramType.cs b/AIStudio.Wpf.DiagramDesigner/Enums/DiagramType.cs
similarity index 82%
rename from Util.DiagramDesigner/Enums/DiagramType.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/DiagramType.cs
index fe94c77..6b983f6 100644
--- a/Util.DiagramDesigner/Enums/DiagramType.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/DiagramType.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum DiagramType
     {
diff --git a/Util.DiagramDesigner/Enums/DrawMode.cs b/AIStudio.Wpf.DiagramDesigner/Enums/DrawMode.cs
similarity index 91%
rename from Util.DiagramDesigner/Enums/DrawMode.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/DrawMode.cs
index a54a9ba..1f0b61d 100644
--- a/Util.DiagramDesigner/Enums/DrawMode.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/DrawMode.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum DrawMode
     {
diff --git a/Util.DiagramDesigner/Enums/FontCase.cs b/AIStudio.Wpf.DiagramDesigner/Enums/FontCase.cs
similarity index 80%
rename from Util.DiagramDesigner/Enums/FontCase.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/FontCase.cs
index 8ecb1f0..60e1815 100644
--- a/Util.DiagramDesigner/Enums/FontCase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/FontCase.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
 
     public enum FontCase
diff --git a/Util.DiagramDesigner/Enums/HorizontalVerticalAlignment.cs b/AIStudio.Wpf.DiagramDesigner/Enums/HorizontalVerticalAlignment.cs
similarity index 91%
rename from Util.DiagramDesigner/Enums/HorizontalVerticalAlignment.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/HorizontalVerticalAlignment.cs
index 9579a78..9e04775 100644
--- a/Util.DiagramDesigner/Enums/HorizontalVerticalAlignment.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/HorizontalVerticalAlignment.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum HorizontalVerticalAlignment
     {
diff --git a/Util.DiagramDesigner/Enums/LineDashStyle.cs b/AIStudio.Wpf.DiagramDesigner/Enums/LineDashStyle.cs
similarity index 92%
rename from Util.DiagramDesigner/Enums/LineDashStyle.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/LineDashStyle.cs
index bfd9f91..c7f7456 100644
--- a/Util.DiagramDesigner/Enums/LineDashStyle.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/LineDashStyle.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum LineDashStyle
     {
diff --git a/Util.DiagramDesigner/Enums/LinearOrientation.cs b/AIStudio.Wpf.DiagramDesigner/Enums/LinearOrientation.cs
similarity index 94%
rename from Util.DiagramDesigner/Enums/LinearOrientation.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/LinearOrientation.cs
index befc553..f6a378d 100644
--- a/Util.DiagramDesigner/Enums/LinearOrientation.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/LinearOrientation.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum LinearOrientation
     {
diff --git a/Util.DiagramDesigner/Enums/LockFlag.cs b/AIStudio.Wpf.DiagramDesigner/Enums/LockFlag.cs
similarity index 96%
rename from Util.DiagramDesigner/Enums/LockFlag.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/LockFlag.cs
index 9605ad8..31f0512 100644
--- a/Util.DiagramDesigner/Enums/LockFlag.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/LockFlag.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum LockFlag
     {
diff --git a/Util.DiagramDesigner/Enums/LogicalType.cs b/AIStudio.Wpf.DiagramDesigner/Enums/LogicalType.cs
similarity index 96%
rename from Util.DiagramDesigner/Enums/LogicalType.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/LogicalType.cs
index 360cac0..f505950 100644
--- a/Util.DiagramDesigner/Enums/LogicalType.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/LogicalType.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum LogicalType
     {
diff --git a/Util.DiagramDesigner/Enums/PageSizeOrientation.cs b/AIStudio.Wpf.DiagramDesigner/Enums/PageSizeOrientation.cs
similarity index 86%
rename from Util.DiagramDesigner/Enums/PageSizeOrientation.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/PageSizeOrientation.cs
index 922c699..50db1b9 100644
--- a/Util.DiagramDesigner/Enums/PageSizeOrientation.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/PageSizeOrientation.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum PageSizeOrientation
     {
diff --git a/Util.DiagramDesigner/Enums/PageSizeType.cs b/AIStudio.Wpf.DiagramDesigner/Enums/PageSizeType.cs
similarity index 98%
rename from Util.DiagramDesigner/Enums/PageSizeType.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/PageSizeType.cs
index 29e4921..6c880bd 100644
--- a/Util.DiagramDesigner/Enums/PageSizeType.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/PageSizeType.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum PageSizeType
     {
diff --git a/Util.DiagramDesigner/Enums/PageUnit.cs b/AIStudio.Wpf.DiagramDesigner/Enums/PageUnit.cs
similarity index 96%
rename from Util.DiagramDesigner/Enums/PageUnit.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/PageUnit.cs
index c0b4650..be0d7a2 100644
--- a/Util.DiagramDesigner/Enums/PageUnit.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/PageUnit.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum PageUnit
     {
diff --git a/Util.DiagramDesigner/Enums/RadialOrientation.cs b/AIStudio.Wpf.DiagramDesigner/Enums/RadialOrientation.cs
similarity index 91%
rename from Util.DiagramDesigner/Enums/RadialOrientation.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/RadialOrientation.cs
index bb70d57..7220357 100644
--- a/Util.DiagramDesigner/Enums/RadialOrientation.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/RadialOrientation.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum RadialOrientation
     {
diff --git a/Util.DiagramDesigner/Enums/ValueTypePoint.cs b/AIStudio.Wpf.DiagramDesigner/Enums/ValueTypePoint.cs
similarity index 81%
rename from Util.DiagramDesigner/Enums/ValueTypePoint.cs
rename to AIStudio.Wpf.DiagramDesigner/Enums/ValueTypePoint.cs
index 3c27451..6c38d22 100644
--- a/Util.DiagramDesigner/Enums/ValueTypePoint.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Enums/ValueTypePoint.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public enum ValueTypePoint
     {
diff --git a/Util.DiagramDesigner/Helpers/ColorHelper.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/ColorHelper.cs
similarity index 99%
rename from Util.DiagramDesigner/Helpers/ColorHelper.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/ColorHelper.cs
index 56d4ac5..13b003e 100644
--- a/Util.DiagramDesigner/Helpers/ColorHelper.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/ColorHelper.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// 类      名：ColorHelper
diff --git a/Util.DiagramDesigner/Helpers/ColorPickerManager.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/ColorPickerManager.cs
similarity index 98%
rename from Util.DiagramDesigner/Helpers/ColorPickerManager.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/ColorPickerManager.cs
index 5ab0b8e..21f53da 100644
--- a/Util.DiagramDesigner/Helpers/ColorPickerManager.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/ColorPickerManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// 获取当前光标处颜色，win8下wpf测试成功
diff --git a/Util.DiagramDesigner/Helpers/ConnectorInfo.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/ConnectorInfo.cs
similarity index 91%
rename from Util.DiagramDesigner/Helpers/ConnectorInfo.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/ConnectorInfo.cs
index e3464ae..5d48c0b 100644
--- a/Util.DiagramDesigner/Helpers/ConnectorInfo.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/ConnectorInfo.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public struct ConnectorInfo
     {
diff --git a/Util.DiagramDesigner/Helpers/ControlExtession.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/ControlExtession.cs
similarity index 99%
rename from Util.DiagramDesigner/Helpers/ControlExtession.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/ControlExtession.cs
index 6a44115..f4c02ef 100644
--- a/Util.DiagramDesigner/Helpers/ControlExtession.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/ControlExtession.cs
@@ -5,7 +5,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public static class ControlExtession
     {
diff --git a/Util.DiagramDesigner/Helpers/ControlMouseDoubleClickCommandBehavior.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/ControlMouseDoubleClickCommandBehavior.cs
similarity index 99%
rename from Util.DiagramDesigner/Helpers/ControlMouseDoubleClickCommandBehavior.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/ControlMouseDoubleClickCommandBehavior.cs
index e6c9514..eefaf49 100644
--- a/Util.DiagramDesigner/Helpers/ControlMouseDoubleClickCommandBehavior.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/ControlMouseDoubleClickCommandBehavior.cs
@@ -3,7 +3,7 @@ using System;
 using System.Windows;
 using System.Windows.Input;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ControlMouseDoubleClickCommandBehavior : Behavior<FrameworkElement>
     {
diff --git a/Util.DiagramDesigner/Helpers/ControlMouseLeftButtonDownCommandBehavior.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/ControlMouseLeftButtonDownCommandBehavior.cs
similarity index 99%
rename from Util.DiagramDesigner/Helpers/ControlMouseLeftButtonDownCommandBehavior.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/ControlMouseLeftButtonDownCommandBehavior.cs
index 0303dc4..f95b92c 100644
--- a/Util.DiagramDesigner/Helpers/ControlMouseLeftButtonDownCommandBehavior.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/ControlMouseLeftButtonDownCommandBehavior.cs
@@ -3,7 +3,7 @@ using System;
 using System.Windows;
 using System.Windows.Input;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ControlMouseLeftButtonDownCommandBehavior : Behavior<FrameworkElement>
     {
diff --git a/Util.DiagramDesigner/Helpers/CopyHelper.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/CopyHelper.cs
similarity index 99%
rename from Util.DiagramDesigner/Helpers/CopyHelper.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/CopyHelper.cs
index c4751ad..d99f67c 100644
--- a/Util.DiagramDesigner/Helpers/CopyHelper.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/CopyHelper.cs
@@ -8,7 +8,7 @@ using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using System.Xml.Serialization;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class CopyHelper
     {
diff --git a/Util.DiagramDesigner/Helpers/CursorPointManager.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/CursorPointManager.cs
similarity index 94%
rename from Util.DiagramDesigner/Helpers/CursorPointManager.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/CursorPointManager.cs
index 48942bc..ba4bd5b 100644
--- a/Util.DiagramDesigner/Helpers/CursorPointManager.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/CursorPointManager.cs
@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Runtime.InteropServices;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// win8下wpf程序测试成功
diff --git a/Util.DiagramDesigner/Helpers/DesignerHelper.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/DesignerHelper.cs
similarity index 96%
rename from Util.DiagramDesigner/Helpers/DesignerHelper.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/DesignerHelper.cs
index 9c2ba27..f809422 100644
--- a/Util.DiagramDesigner/Helpers/DesignerHelper.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/DesignerHelper.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Windows;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class DesignerHelper
     {
diff --git a/Util.DiagramDesigner/Helpers/DoCommandManager.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/DoCommandManager.cs
similarity index 98%
rename from Util.DiagramDesigner/Helpers/DoCommandManager.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/DoCommandManager.cs
index 669dd9c..96d25c6 100644
--- a/Util.DiagramDesigner/Helpers/DoCommandManager.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/DoCommandManager.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     class DoCommandManager
     {
diff --git a/Util.DiagramDesigner/Helpers/DragObject.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/DragObject.cs
similarity index 92%
rename from Util.DiagramDesigner/Helpers/DragObject.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/DragObject.cs
index 6d8d6b6..ca2c843 100644
--- a/Util.DiagramDesigner/Helpers/DragObject.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/DragObject.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     // Wraps info of the dragged object into a class
     public class DragObject
diff --git a/Util.DiagramDesigner/Helpers/EnumExtension.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/EnumExtension.cs
similarity index 92%
rename from Util.DiagramDesigner/Helpers/EnumExtension.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/EnumExtension.cs
index 5e2f616..8ad8400 100644
--- a/Util.DiagramDesigner/Helpers/EnumExtension.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/EnumExtension.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Reflection;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public static class EnumExtension
     {
diff --git a/Util.DiagramDesigner/Helpers/EventToCommandArgs.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/EventToCommandArgs.cs
similarity index 94%
rename from Util.DiagramDesigner/Helpers/EventToCommandArgs.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/EventToCommandArgs.cs
index 1c6b51e..0710760 100644
--- a/Util.DiagramDesigner/Helpers/EventToCommandArgs.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/EventToCommandArgs.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class EventToCommandArgs
     {
diff --git a/Util.DiagramDesigner/Helpers/Extention.Object.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/Extention.Object.cs
similarity index 99%
rename from Util.DiagramDesigner/Helpers/Extention.Object.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/Extention.Object.cs
index 2d18e2e..ca1b733 100644
--- a/Util.DiagramDesigner/Helpers/Extention.Object.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/Extention.Object.cs
@@ -6,7 +6,7 @@ using System.Reflection;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public static partial class Extention
     {
diff --git a/Util.DiagramDesigner/Helpers/IPathFinder.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/IPathFinder.cs
similarity index 92%
rename from Util.DiagramDesigner/Helpers/IPathFinder.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/IPathFinder.cs
index e3a0382..499c3c5 100644
--- a/Util.DiagramDesigner/Helpers/IPathFinder.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/IPathFinder.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public interface IPathFinder
     {
diff --git a/Util.DiagramDesigner/Helpers/OrthogonalPathFinder.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/OrthogonalPathFinder.cs
similarity index 99%
rename from Util.DiagramDesigner/Helpers/OrthogonalPathFinder.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/OrthogonalPathFinder.cs
index 15f15a3..32ddb50 100644
--- a/Util.DiagramDesigner/Helpers/OrthogonalPathFinder.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/OrthogonalPathFinder.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     // Note: I couldn't find a useful open source library that does
     // orthogonal routing so started to write something on my own.
diff --git a/Util.DiagramDesigner/Helpers/PointHelper.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/PointHelper.cs
similarity index 97%
rename from Util.DiagramDesigner/Helpers/PointHelper.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/PointHelper.cs
index 7a50964..40de5ba 100644
--- a/Util.DiagramDesigner/Helpers/PointHelper.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/PointHelper.cs
@@ -8,7 +8,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class PointHelper
     {
diff --git a/Util.DiagramDesigner/Helpers/SegmentHelper.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/SegmentHelper.cs
similarity index 98%
rename from Util.DiagramDesigner/Helpers/SegmentHelper.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/SegmentHelper.cs
index b05b0c5..106eec2 100644
--- a/Util.DiagramDesigner/Helpers/SegmentHelper.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/SegmentHelper.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class SegmentHelper
     {
diff --git a/Util.DiagramDesigner/Helpers/ToolBoxData.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/ToolBoxData.cs
similarity index 94%
rename from Util.DiagramDesigner/Helpers/ToolBoxData.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/ToolBoxData.cs
index f751153..0d23e39 100644
--- a/Util.DiagramDesigner/Helpers/ToolBoxData.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/ToolBoxData.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Util.DiagramDesigner.Helpers
+namespace AIStudio.Wpf.DiagramDesigner.Helpers
 {
     public class ToolBoxData
     {
diff --git a/Util.DiagramDesigner/Helpers/WeakINPCEventHandler.cs b/AIStudio.Wpf.DiagramDesigner/Helpers/WeakINPCEventHandler.cs
similarity index 95%
rename from Util.DiagramDesigner/Helpers/WeakINPCEventHandler.cs
rename to AIStudio.Wpf.DiagramDesigner/Helpers/WeakINPCEventHandler.cs
index 31bdd3a..4463fec 100644
--- a/Util.DiagramDesigner/Helpers/WeakINPCEventHandler.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Helpers/WeakINPCEventHandler.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 
-namespace Util.DiagramDesigner.Helpers
+namespace AIStudio.Wpf.DiagramDesigner.Helpers
 {
     //[DebuggerNonUserCode]
     public sealed class WeakINPCEventHandler 
diff --git a/Util.DiagramDesigner/Images/FormatPainter.cur b/AIStudio.Wpf.DiagramDesigner/Images/FormatPainter.cur
similarity index 100%
rename from Util.DiagramDesigner/Images/FormatPainter.cur
rename to AIStudio.Wpf.DiagramDesigner/Images/FormatPainter.cur
diff --git a/Util.DiagramDesigner/Images/Gifs/car_chase.gif b/AIStudio.Wpf.DiagramDesigner/Images/Gifs/car_chase.gif
similarity index 100%
rename from Util.DiagramDesigner/Images/Gifs/car_chase.gif
rename to AIStudio.Wpf.DiagramDesigner/Images/Gifs/car_chase.gif
diff --git a/Util.DiagramDesigner/Images/file.png b/AIStudio.Wpf.DiagramDesigner/Images/file.png
similarity index 100%
rename from Util.DiagramDesigner/Images/file.png
rename to AIStudio.Wpf.DiagramDesigner/Images/file.png
diff --git a/Util.DiagramDesigner/Messenger/Mediator.cs b/AIStudio.Wpf.DiagramDesigner/Messenger/Mediator.cs
similarity index 99%
rename from Util.DiagramDesigner/Messenger/Mediator.cs
rename to AIStudio.Wpf.DiagramDesigner/Messenger/Mediator.cs
index 78aa243..ac5aebf 100644
--- a/Util.DiagramDesigner/Messenger/Mediator.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Messenger/Mediator.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Diagnostics;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     #region WeakAction Inner Class
     /// <summary>
diff --git a/Util.DiagramDesigner/Messenger/MediatorMessageSinkAttribute.cs b/AIStudio.Wpf.DiagramDesigner/Messenger/MediatorMessageSinkAttribute.cs
similarity index 96%
rename from Util.DiagramDesigner/Messenger/MediatorMessageSinkAttribute.cs
rename to AIStudio.Wpf.DiagramDesigner/Messenger/MediatorMessageSinkAttribute.cs
index 98a4fab..005b6ba 100644
--- a/Util.DiagramDesigner/Messenger/MediatorMessageSinkAttribute.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Messenger/MediatorMessageSinkAttribute.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// This attribute allows a method to be targeted as a recipient for a message.
diff --git a/Util.DiagramDesigner/Models/ConnectionItem.cs b/AIStudio.Wpf.DiagramDesigner/Models/ConnectionItem.cs
similarity index 98%
rename from Util.DiagramDesigner/Models/ConnectionItem.cs
rename to AIStudio.Wpf.DiagramDesigner/Models/ConnectionItem.cs
index a1e0485..ed950d2 100644
--- a/Util.DiagramDesigner/Models/ConnectionItem.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/ConnectionItem.cs
@@ -1,4 +1,4 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Xml.Serialization;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     [Serializable]
     [XmlInclude(typeof(ConnectionItem))]
diff --git a/Util.DiagramDesigner/Models/ConnectorItem.cs b/AIStudio.Wpf.DiagramDesigner/Models/ConnectorItem.cs
similarity index 89%
rename from Util.DiagramDesigner/Models/ConnectorItem.cs
rename to AIStudio.Wpf.DiagramDesigner/Models/ConnectorItem.cs
index 7a119f9..c03ba17 100644
--- a/Util.DiagramDesigner/Models/ConnectorItem.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/ConnectorItem.cs
@@ -1,11 +1,11 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ConnectorItem
     {
diff --git a/Util.DiagramDesigner/Models/DesignerItemBase.cs b/AIStudio.Wpf.DiagramDesigner/Models/DesignerItemBase.cs
similarity index 95%
rename from Util.DiagramDesigner/Models/DesignerItemBase.cs
rename to AIStudio.Wpf.DiagramDesigner/Models/DesignerItemBase.cs
index 01e4d66..8f95d3f 100644
--- a/Util.DiagramDesigner/Models/DesignerItemBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/DesignerItemBase.cs
@@ -1,4 +1,4 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Xml.Serialization;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     [Serializable]
     [XmlInclude(typeof(DesignerItemBase))]
diff --git a/Util.DiagramDesigner/Models/ImageDesignerItem.cs b/AIStudio.Wpf.DiagramDesigner/Models/ImageDesignerItem.cs
similarity index 96%
rename from Util.DiagramDesigner/Models/ImageDesignerItem.cs
rename to AIStudio.Wpf.DiagramDesigner/Models/ImageDesignerItem.cs
index d683d89..ec50cf6 100644
--- a/Util.DiagramDesigner/Models/ImageDesignerItem.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/ImageDesignerItem.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ImageDesignerItem : DesignerItemBase
     {
diff --git a/Util.DiagramDesigner/Models/LogicalGateDesignerItemBase.cs b/AIStudio.Wpf.DiagramDesigner/Models/LogicalGateDesignerItemBase.cs
similarity index 97%
rename from Util.DiagramDesigner/Models/LogicalGateDesignerItemBase.cs
rename to AIStudio.Wpf.DiagramDesigner/Models/LogicalGateDesignerItemBase.cs
index cb92126..ff190e2 100644
--- a/Util.DiagramDesigner/Models/LogicalGateDesignerItemBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/LogicalGateDesignerItemBase.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class LogicalGateDesignerItemBase : DesignerItemBase
     {
diff --git a/Util.DiagramDesigner/Models/MediaDesignerItem.cs b/AIStudio.Wpf.DiagramDesigner/Models/MediaDesignerItem.cs
similarity index 97%
rename from Util.DiagramDesigner/Models/MediaDesignerItem.cs
rename to AIStudio.Wpf.DiagramDesigner/Models/MediaDesignerItem.cs
index 0ba85b3..3fafb15 100644
--- a/Util.DiagramDesigner/Models/MediaDesignerItem.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/MediaDesignerItem.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class MediaDesignerItem : DesignerItemBase
     {
diff --git a/Util.DiagramDesigner/Models/SelectableDesignerItemBase.cs b/AIStudio.Wpf.DiagramDesigner/Models/SelectableDesignerItemBase.cs
similarity index 99%
rename from Util.DiagramDesigner/Models/SelectableDesignerItemBase.cs
rename to AIStudio.Wpf.DiagramDesigner/Models/SelectableDesignerItemBase.cs
index eca49b8..88273ec 100644
--- a/Util.DiagramDesigner/Models/SelectableDesignerItemBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/SelectableDesignerItemBase.cs
@@ -10,7 +10,7 @@ using System.Windows;
 using System.Windows.Media;
 using System.Xml.Serialization;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
 
     public abstract class SelectableDesignerItemBase
diff --git a/Util.DiagramDesigner/Models/TextDesignerItem.cs b/AIStudio.Wpf.DiagramDesigner/Models/TextDesignerItem.cs
similarity index 83%
rename from Util.DiagramDesigner/Models/TextDesignerItem.cs
rename to AIStudio.Wpf.DiagramDesigner/Models/TextDesignerItem.cs
index ca010d4..439e0a0 100644
--- a/Util.DiagramDesigner/Models/TextDesignerItem.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/TextDesignerItem.cs
@@ -1,4 +1,4 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class TextDesignerItem : DesignerItemBase
     {
diff --git a/Util.DiagramDesigner/Paths/ArrowPathData.cs b/AIStudio.Wpf.DiagramDesigner/Paths/ArrowPathData.cs
similarity index 99%
rename from Util.DiagramDesigner/Paths/ArrowPathData.cs
rename to AIStudio.Wpf.DiagramDesigner/Paths/ArrowPathData.cs
index aec544c..dc475f1 100644
--- a/Util.DiagramDesigner/Paths/ArrowPathData.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Paths/ArrowPathData.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ArrowPathData
     {
diff --git a/Util.DiagramDesigner/Paths/StrokeDashArray.cs b/AIStudio.Wpf.DiagramDesigner/Paths/StrokeDashArray.cs
similarity index 97%
rename from Util.DiagramDesigner/Paths/StrokeDashArray.cs
rename to AIStudio.Wpf.DiagramDesigner/Paths/StrokeDashArray.cs
index edaaa1a..b53b9a7 100644
--- a/Util.DiagramDesigner/Paths/StrokeDashArray.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Paths/StrokeDashArray.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class StrokeDashArray
     {
diff --git a/Util.DiagramDesigner/Properties/AssemblyInfo.cs b/AIStudio.Wpf.DiagramDesigner/Properties/AssemblyInfo.cs
similarity index 91%
rename from Util.DiagramDesigner/Properties/AssemblyInfo.cs
rename to AIStudio.Wpf.DiagramDesigner/Properties/AssemblyInfo.cs
index e8bf5db..71f8852 100644
--- a/Util.DiagramDesigner/Properties/AssemblyInfo.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Windows.Markup;
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: XmlnsDefinition("https://astudio.github.io/diagram", "Util.DiagramDesigner")]
-[assembly: XmlnsDefinition("https://astudio.github.io/diagram", "Util.DiagramDesigner.Controls")]
+[assembly: XmlnsDefinition("https://astudio.github.io/diagram", "AIStudio.Wpf.DiagramDesigner")]
+[assembly: XmlnsDefinition("https://astudio.github.io/diagram", "AIStudio.Wpf.DiagramDesigner.Controls")]
 
 [assembly: XmlnsPrefix("https://astudio.github.io/diagram", "dd")]
\ No newline at end of file
diff --git a/Util.DiagramDesigner/Resources/Styles/DesignerItems.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/DesignerItems.xaml
similarity index 94%
rename from Util.DiagramDesigner/Resources/Styles/DesignerItems.xaml
rename to AIStudio.Wpf.DiagramDesigner/Resources/Styles/DesignerItems.xaml
index 4509025..4b9a3b4 100644
--- a/Util.DiagramDesigner/Resources/Styles/DesignerItems.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/DesignerItems.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner"
-                    xmlns:c="clr-namespace:Util.DiagramDesigner.Controls">
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner"
+                    xmlns:c="clr-namespace:AIStudio.Wpf.DiagramDesigner.Controls">
 
   
     <!-- Connector Style -->
diff --git a/Util.DiagramDesigner/Resources/Styles/Expander.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/Expander.xaml
similarity index 100%
rename from Util.DiagramDesigner/Resources/Styles/Expander.xaml
rename to AIStudio.Wpf.DiagramDesigner/Resources/Styles/Expander.xaml
diff --git a/Util.DiagramDesigner/Resources/Styles/GroupBox.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/GroupBox.xaml
similarity index 100%
rename from Util.DiagramDesigner/Resources/Styles/GroupBox.xaml
rename to AIStudio.Wpf.DiagramDesigner/Resources/Styles/GroupBox.xaml
diff --git a/Util.DiagramDesigner/Resources/Styles/ScrollBar.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollBar.xaml
similarity index 100%
rename from Util.DiagramDesigner/Resources/Styles/ScrollBar.xaml
rename to AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollBar.xaml
diff --git a/Util.DiagramDesigner/Resources/Styles/ScrollViewer.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollViewer.xaml
similarity index 100%
rename from Util.DiagramDesigner/Resources/Styles/ScrollViewer.xaml
rename to AIStudio.Wpf.DiagramDesigner/Resources/Styles/ScrollViewer.xaml
diff --git a/Util.DiagramDesigner/Resources/Styles/Shared.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/Shared.xaml
similarity index 100%
rename from Util.DiagramDesigner/Resources/Styles/Shared.xaml
rename to AIStudio.Wpf.DiagramDesigner/Resources/Styles/Shared.xaml
diff --git a/Util.DiagramDesigner/Resources/Styles/ToolTip.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ToolTip.xaml
similarity index 100%
rename from Util.DiagramDesigner/Resources/Styles/ToolTip.xaml
rename to AIStudio.Wpf.DiagramDesigner/Resources/Styles/ToolTip.xaml
diff --git a/Util.DiagramDesigner/Resources/Styles/ZoomBox.xaml b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ZoomBox.xaml
similarity index 99%
rename from Util.DiagramDesigner/Resources/Styles/ZoomBox.xaml
rename to AIStudio.Wpf.DiagramDesigner/Resources/Styles/ZoomBox.xaml
index aac5a84..53efc24 100644
--- a/Util.DiagramDesigner/Resources/Styles/ZoomBox.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Resources/Styles/ZoomBox.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner">
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/Util.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs b/AIStudio.Wpf.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs
similarity index 97%
rename from Util.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs
rename to AIStudio.Wpf.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs
index 9d9164f..afd2fd3 100644
--- a/Util.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs
+++ b/AIStudio.Wpf.DiagramDesigner/StyleSelectors/DesignerItemsControlItemStyleSelector.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class DesignerItemsControlItemStyleSelector : StyleSelector
     {
diff --git a/Util.DiagramDesigner/Themes/Generic.xaml b/AIStudio.Wpf.DiagramDesigner/Themes/Generic.xaml
similarity index 98%
rename from Util.DiagramDesigner/Themes/Generic.xaml
rename to AIStudio.Wpf.DiagramDesigner/Themes/Generic.xaml
index b89073e..85eefd4 100644
--- a/Util.DiagramDesigner/Themes/Generic.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Themes/Generic.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner"
-                    xmlns:c="clr-namespace:Util.DiagramDesigner.Controls"
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner"
+                    xmlns:c="clr-namespace:AIStudio.Wpf.DiagramDesigner.Controls"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:gif="http://wpfanimatedgif.codeplex.com" >
 
@@ -195,7 +195,7 @@
                 <Setter TargetName="PART_ResizeDecorator" Property="Visibility" Value="Visible"/>
             </DataTrigger>
             <DataTrigger Binding="{Binding Suffix}" Value=".txt">
-                <Setter TargetName="image" Property="Source" Value="pack://application:,,,/Util.DiagramDesigner;component/Images/file.png"/>
+                <Setter TargetName="image" Property="Source" Value="pack://application:,,,/AIStudio.Wpf.DiagramDesigner;component/Images/file.png"/>
                 <Setter TargetName="image" Property="Margin" Value="0"/>
                 <Setter TargetName="image" Property="Clip" Value="{x:Null}"/>
             </DataTrigger>
diff --git a/Util.DiagramDesigner/UserControls/ConnectorContainer.xaml b/AIStudio.Wpf.DiagramDesigner/UserControls/ConnectorContainer.xaml
similarity index 80%
rename from Util.DiagramDesigner/UserControls/ConnectorContainer.xaml
rename to AIStudio.Wpf.DiagramDesigner/UserControls/ConnectorContainer.xaml
index eb08816..f31442b 100644
--- a/Util.DiagramDesigner/UserControls/ConnectorContainer.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/ConnectorContainer.xaml
@@ -1,9 +1,9 @@
-<ItemsControl x:Class="Util.DiagramDesigner.ConnectorContainer"
+<ItemsControl x:Class="AIStudio.Wpf.DiagramDesigner.ConnectorContainer"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:s="clr-namespace:Util.DiagramDesigner"
+             xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <ItemsControl.ItemsPanel>
diff --git a/Util.DiagramDesigner/UserControls/ConnectorContainer.xaml.cs b/AIStudio.Wpf.DiagramDesigner/UserControls/ConnectorContainer.xaml.cs
similarity index 98%
rename from Util.DiagramDesigner/UserControls/ConnectorContainer.xaml.cs
rename to AIStudio.Wpf.DiagramDesigner/UserControls/ConnectorContainer.xaml.cs
index 0c2c5cb..ee59ff4 100644
--- a/Util.DiagramDesigner/UserControls/ConnectorContainer.xaml.cs
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/ConnectorContainer.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// Interaction logic for ConnectorContainer.xaml
diff --git a/Util.DiagramDesigner/UserControls/DiagramControl.xaml b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
similarity index 99%
rename from Util.DiagramDesigner/UserControls/DiagramControl.xaml
rename to AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
index e2f45a6..2d9ad0d 100644
--- a/Util.DiagramDesigner/UserControls/DiagramControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="Util.DiagramDesigner.DiagramControl"
+<UserControl x:Class="AIStudio.Wpf.DiagramDesigner.DiagramControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:s="clr-namespace:Util.DiagramDesigner"
-             xmlns:c="clr-namespace:Util.DiagramDesigner.Controls"
+             xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner"
+             xmlns:c="clr-namespace:AIStudio.Wpf.DiagramDesigner.Controls"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:i="http://schemas.microsoft.com/xaml/behaviors" 
              mc:Ignorable="d" HorizontalAlignment="Center" VerticalAlignment="Center"
@@ -12,7 +12,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Util.DiagramDesigner;component/Themes/Generic.xaml" />
+                <ResourceDictionary Source="/AIStudio.Wpf.DiagramDesigner;component/Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
             <s:ColorBrushConverter x:Key="ColorBrushConverter" />
diff --git a/Util.DiagramDesigner/UserControls/DiagramControl.xaml.cs b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml.cs
similarity index 97%
rename from Util.DiagramDesigner/UserControls/DiagramControl.xaml.cs
rename to AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml.cs
index 63f1b41..e1c6234 100644
--- a/Util.DiagramDesigner/UserControls/DiagramControl.xaml.cs
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// Interaction logic for DiagramControl.xaml
diff --git a/Util.DiagramDesigner/UserControls/PointContainer.xaml b/AIStudio.Wpf.DiagramDesigner/UserControls/PointContainer.xaml
similarity index 80%
rename from Util.DiagramDesigner/UserControls/PointContainer.xaml
rename to AIStudio.Wpf.DiagramDesigner/UserControls/PointContainer.xaml
index d1b2b79..2c839f8 100644
--- a/Util.DiagramDesigner/UserControls/PointContainer.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/PointContainer.xaml
@@ -1,9 +1,9 @@
-<ItemsControl x:Class="Util.DiagramDesigner.PointContainer"
+<ItemsControl x:Class="AIStudio.Wpf.DiagramDesigner.PointContainer"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Util.DiagramDesigner"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramDesigner"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <ItemsControl.ItemsPanel>
diff --git a/Util.DiagramDesigner/UserControls/PointContainer.xaml.cs b/AIStudio.Wpf.DiagramDesigner/UserControls/PointContainer.xaml.cs
similarity index 94%
rename from Util.DiagramDesigner/UserControls/PointContainer.xaml.cs
rename to AIStudio.Wpf.DiagramDesigner/UserControls/PointContainer.xaml.cs
index 0b506d1..307704a 100644
--- a/Util.DiagramDesigner/UserControls/PointContainer.xaml.cs
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/PointContainer.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// PointContainer.xaml 的交互逻辑
diff --git a/Util.DiagramDesigner/UserControls/TextControl.xaml b/AIStudio.Wpf.DiagramDesigner/UserControls/TextControl.xaml
similarity index 98%
rename from Util.DiagramDesigner/UserControls/TextControl.xaml
rename to AIStudio.Wpf.DiagramDesigner/UserControls/TextControl.xaml
index 1f73c7b..5baf884 100644
--- a/Util.DiagramDesigner/UserControls/TextControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/TextControl.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="Util.DiagramDesigner.TextControl"
+<UserControl x:Class="AIStudio.Wpf.DiagramDesigner.TextControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:s="clr-namespace:Util.DiagramDesigner"
+             xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
diff --git a/Util.DiagramDesigner/UserControls/TextControl.xaml.cs b/AIStudio.Wpf.DiagramDesigner/UserControls/TextControl.xaml.cs
similarity index 99%
rename from Util.DiagramDesigner/UserControls/TextControl.xaml.cs
rename to AIStudio.Wpf.DiagramDesigner/UserControls/TextControl.xaml.cs
index e95b7d3..ba57f08 100644
--- a/Util.DiagramDesigner/UserControls/TextControl.xaml.cs
+++ b/AIStudio.Wpf.DiagramDesigner/UserControls/TextControl.xaml.cs
@@ -11,7 +11,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// TextControl.xaml 的交互逻辑
diff --git a/Util.DiagramDesigner/Util.DiagramDesigner_kn2lil5m_wpftmp.csproj b/AIStudio.Wpf.DiagramDesigner/Util.DiagramDesigner_kn2lil5m_wpftmp.csproj
similarity index 100%
rename from Util.DiagramDesigner/Util.DiagramDesigner_kn2lil5m_wpftmp.csproj
rename to AIStudio.Wpf.DiagramDesigner/Util.DiagramDesigner_kn2lil5m_wpftmp.csproj
diff --git a/Util.DiagramDesigner/Util.DiagramDesigner_q2uer1wu_wpftmp.csproj b/AIStudio.Wpf.DiagramDesigner/Util.DiagramDesigner_q2uer1wu_wpftmp.csproj
similarity index 100%
rename from Util.DiagramDesigner/Util.DiagramDesigner_q2uer1wu_wpftmp.csproj
rename to AIStudio.Wpf.DiagramDesigner/Util.DiagramDesigner_q2uer1wu_wpftmp.csproj
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/ColorViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/ColorViewModel.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/ColorViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/ColorViewModel.cs
index d06da09..35fb193 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/ColorViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/ColorViewModel.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     [Serializable]
     public class ColorViewModel : BindableBase, IColorViewModel
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/DiagramServicesProvider.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/DiagramServicesProvider.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/DiagramServicesProvider.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/DiagramServicesProvider.cs
index 22ed469..418f7a8 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/DiagramServicesProvider.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/DiagramServicesProvider.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// Simple service interface
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/DrawModeViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/DrawModeViewModel.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/DrawModeViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/DrawModeViewModel.cs
index 2946d9a..172fb10 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/DrawModeViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/DrawModeViewModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class DrawModeViewModel : BindableBase, IDrawModeViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/FontViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/FontViewModel.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/FontViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/FontViewModel.cs
index d80218e..5a695bf 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/FontViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/FontViewModel.cs
@@ -8,7 +8,7 @@ using System.Windows.Input;
 using System.Windows.Markup;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class FontViewModel : BindableBase, IFontViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/IColorViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IColorViewModel.cs
similarity index 94%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/IColorViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IColorViewModel.cs
index b1701d4..06f2c3f 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/IColorViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IColorViewModel.cs
@@ -4,7 +4,7 @@ using System.ComponentModel;
 using System.Text;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public interface IColorViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/IDrawModeViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IDrawModeViewModel.cs
similarity index 89%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/IDrawModeViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IDrawModeViewModel.cs
index 0473e3e..21f4448 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/IDrawModeViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IDrawModeViewModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public interface IDrawModeViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/IFontViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IFontViewModel.cs
similarity index 95%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/IFontViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IFontViewModel.cs
index 8b5ab6c..e64da1c 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/IFontViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IFontViewModel.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public interface IFontViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/ILockObjectViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/ILockObjectViewModel.cs
similarity index 88%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/ILockObjectViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/ILockObjectViewModel.cs
index c99244f..f9c26d4 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/ILockObjectViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/ILockObjectViewModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public interface ILockObjectViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/IQuickThemeViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IQuickThemeViewModel.cs
similarity index 84%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/IQuickThemeViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IQuickThemeViewModel.cs
index d89bc33..7164a1e 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/IQuickThemeViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/IQuickThemeViewModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public interface IQuickThemeViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/LockObjectViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/LockObjectViewModel.cs
similarity index 98%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/LockObjectViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/LockObjectViewModel.cs
index 797f976..af11660 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/LockObjectViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/LockObjectViewModel.cs
@@ -4,7 +4,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class LockObjectViewModel : ILockObjectViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/AdditionViewModel/QuickThemeViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/QuickThemeViewModel.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/AdditionViewModel/QuickThemeViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/QuickThemeViewModel.cs
index c76839d..61c2ec0 100644
--- a/Util.DiagramDesigner/ViewModels/AdditionViewModel/QuickThemeViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/AdditionViewModel/QuickThemeViewModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class QuickThemeViewModel : BindableBase, IQuickThemeViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/BaseViewModel/ConnectorInfoBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectorInfoBase.cs
similarity index 97%
rename from Util.DiagramDesigner/ViewModels/BaseViewModel/ConnectorInfoBase.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectorInfoBase.cs
index ad04dad..c3636b2 100644
--- a/Util.DiagramDesigner/ViewModels/BaseViewModel/ConnectorInfoBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectorInfoBase.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public abstract class ConnectorInfoBase : BindableBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
index 6cb5636..fa99272 100644
--- a/Util.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Linq;
 using System.Reactive.Linq;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public abstract class DesignerItemViewModelBase : SelectableDesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
similarity index 85%
rename from Util.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
index a21c904..2d2e483 100644
--- a/Util.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class GroupDesignerItemViewModel : DesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/BaseViewModel/LogicalGateItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/LogicalGateItemViewModelBase.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/BaseViewModel/LogicalGateItemViewModelBase.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/LogicalGateItemViewModelBase.cs
index f6369f6..9483175 100644
--- a/Util.DiagramDesigner/ViewModels/BaseViewModel/LogicalGateItemViewModelBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/LogicalGateItemViewModelBase.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class LogicalGateItemViewModelBase : DesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/BaseViewModel/PointInfoBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/PointInfoBase.cs
similarity index 98%
rename from Util.DiagramDesigner/ViewModels/BaseViewModel/PointInfoBase.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/PointInfoBase.cs
index 9916610..5f29a04 100644
--- a/Util.DiagramDesigner/ViewModels/BaseViewModel/PointInfoBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/PointInfoBase.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class PointInfoBase : BindableBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
index 65f24e0..b6ed1d2 100644
--- a/Util.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
 
     public interface ISelectItems
diff --git a/Util.DiagramDesigner/ViewModels/BindableBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BindableBase.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/BindableBase.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/BindableBase.cs
index 174223e..5588858 100644
--- a/Util.DiagramDesigner/ViewModels/BindableBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BindableBase.cs
@@ -5,7 +5,7 @@ using System.Reactive.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     /// <summary>
     /// Implementation of <see cref="INotifyPropertyChanged"/> to simplify models.
diff --git a/Util.DiagramDesigner/ViewModels/ConnectorViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/ConnectorViewModel.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/ConnectorViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/ConnectorViewModel.cs
index 0faba41..fb24108 100644
--- a/Util.DiagramDesigner/ViewModels/ConnectorViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/ConnectorViewModel.cs
@@ -4,9 +4,9 @@ using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using Util.DiagramDesigner.Helpers;
+using AIStudio.Wpf.DiagramDesigner.Helpers;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ConnectorViewModel : SelectableDesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/DiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/DiagramViewModel.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/DiagramViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/DiagramViewModel.cs
index 20c0610..ac7650b 100644
--- a/Util.DiagramDesigner/ViewModels/DiagramViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/DiagramViewModel.cs
@@ -9,7 +9,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class DiagramViewModel : BindableBase, IDiagramViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/FullyCreatedConnectorInfo.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/FullyCreatedConnectorInfo.cs
similarity index 98%
rename from Util.DiagramDesigner/ViewModels/FullyCreatedConnectorInfo.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/FullyCreatedConnectorInfo.cs
index 421b2a3..b48129e 100644
--- a/Util.DiagramDesigner/ViewModels/FullyCreatedConnectorInfo.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/FullyCreatedConnectorInfo.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class FullyCreatedConnectorInfo : ConnectorInfoBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/IDiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs
similarity index 98%
rename from Util.DiagramDesigner/ViewModels/IDiagramViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs
index 09d3a81..b66a195 100644
--- a/Util.DiagramDesigner/ViewModels/IDiagramViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Media;
 using System.ComponentModel;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public interface IDiagramViewModel
     {
diff --git a/Util.DiagramDesigner/ViewModels/IGroupable.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/IGroupable.cs
similarity index 85%
rename from Util.DiagramDesigner/ViewModels/IGroupable.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/IGroupable.cs
index 94d67bc..94488b9 100644
--- a/Util.DiagramDesigner/ViewModels/IGroupable.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/IGroupable.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public interface IGroupable
     {
diff --git a/Util.DiagramDesigner/ViewModels/INPCBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/INPCBase.cs
similarity index 98%
rename from Util.DiagramDesigner/ViewModels/INPCBase.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/INPCBase.cs
index 6582ad3..4ef2ae5 100644
--- a/Util.DiagramDesigner/ViewModels/INPCBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/INPCBase.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Linq;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     //[Serializable]
     //public abstract class BindableBase : INotifyPropertyChanged
diff --git a/Util.DiagramDesigner/ViewModels/ISelectable.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/ISelectable.cs
similarity index 81%
rename from Util.DiagramDesigner/ViewModels/ISelectable.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/ISelectable.cs
index ccfe288..98d4686 100644
--- a/Util.DiagramDesigner/ViewModels/ISelectable.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/ISelectable.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public interface ISelectable
     {
diff --git a/Util.DiagramDesigner/ViewModels/PartCreatedConnectionInfo.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/PartCreatedConnectionInfo.cs
similarity index 91%
rename from Util.DiagramDesigner/ViewModels/PartCreatedConnectionInfo.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/PartCreatedConnectionInfo.cs
index fcefd03..18dba02 100644
--- a/Util.DiagramDesigner/ViewModels/PartCreatedConnectionInfo.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/PartCreatedConnectionInfo.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class PartCreatedConnectionInfo : ConnectorInfoBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/SelectionService.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs
similarity index 98%
rename from Util.DiagramDesigner/ViewModels/SelectionService.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs
index 0a1837c..39c961b 100644
--- a/Util.DiagramDesigner/ViewModels/SelectionService.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class SelectionService
     {
diff --git a/Util.DiagramDesigner/ViewModels/SimpleCommand.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleCommand.cs
similarity index 98%
rename from Util.DiagramDesigner/ViewModels/SimpleCommand.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleCommand.cs
index 559d08a..4d5e7db 100644
--- a/Util.DiagramDesigner/ViewModels/SimpleCommand.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleCommand.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Input;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class SimpleCommand : ICommand
     {
diff --git a/Util.DiagramDesigner/ViewModels/SimpleViewModel/GifImageItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/GifImageItemViewModel.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/SimpleViewModel/GifImageItemViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/GifImageItemViewModel.cs
index 5085084..ed22c75 100644
--- a/Util.DiagramDesigner/ViewModels/SimpleViewModel/GifImageItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/GifImageItemViewModel.cs
@@ -10,7 +10,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class GifImageItemViewModel : DesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/SimpleViewModel/ImageItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/ImageItemViewModel.cs
similarity index 99%
rename from Util.DiagramDesigner/ViewModels/SimpleViewModel/ImageItemViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/ImageItemViewModel.cs
index 85e55e8..ec80a3f 100644
--- a/Util.DiagramDesigner/ViewModels/SimpleViewModel/ImageItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/ImageItemViewModel.cs
@@ -10,7 +10,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ImageItemViewModel : DesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/SimpleViewModel/LinkPointDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/LinkPointDesignerItemViewModel.cs
similarity index 95%
rename from Util.DiagramDesigner/ViewModels/SimpleViewModel/LinkPointDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/LinkPointDesignerItemViewModel.cs
index 281f3a4..e5f15f0 100644
--- a/Util.DiagramDesigner/ViewModels/SimpleViewModel/LinkPointDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/LinkPointDesignerItemViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class LinkPointDesignerItemViewModel : DesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/SimpleViewModel/MediaItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/MediaItemViewModel.cs
similarity index 98%
rename from Util.DiagramDesigner/ViewModels/SimpleViewModel/MediaItemViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/MediaItemViewModel.cs
index 7c005cd..48f0054 100644
--- a/Util.DiagramDesigner/ViewModels/SimpleViewModel/MediaItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/MediaItemViewModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class MediaItemViewModel : DesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/SimpleViewModel/PointDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/PointDesignerItemViewModel.cs
similarity index 96%
rename from Util.DiagramDesigner/ViewModels/SimpleViewModel/PointDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/PointDesignerItemViewModel.cs
index f7713bb..01c07b6 100644
--- a/Util.DiagramDesigner/ViewModels/SimpleViewModel/PointDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/PointDesignerItemViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class PointDesignerItemViewModel : DesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/SimpleViewModel/ShapeDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/ShapeDesignerItemViewModel.cs
similarity index 98%
rename from Util.DiagramDesigner/ViewModels/SimpleViewModel/ShapeDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/ShapeDesignerItemViewModel.cs
index 995ac0d..e534165 100644
--- a/Util.DiagramDesigner/ViewModels/SimpleViewModel/ShapeDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/ShapeDesignerItemViewModel.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Media;
 using System.Windows.Shapes;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class ShapeDesignerItemViewModel : DesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/SimpleViewModel/TextDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/TextDesignerItemViewModel.cs
similarity index 93%
rename from Util.DiagramDesigner/ViewModels/SimpleViewModel/TextDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/TextDesignerItemViewModel.cs
index 8d71a13..29612d4 100644
--- a/Util.DiagramDesigner/ViewModels/SimpleViewModel/TextDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/TextDesignerItemViewModel.cs
@@ -1,7 +1,7 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using System.Windows.Media;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class TextDesignerItemViewModel : DesignerItemViewModelBase
     {
diff --git a/Util.DiagramDesigner/ViewModels/SimpleViewModel/VideoItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/VideoItemViewModel.cs
similarity index 93%
rename from Util.DiagramDesigner/ViewModels/SimpleViewModel/VideoItemViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/VideoItemViewModel.cs
index a4185c2..6f7a65d 100644
--- a/Util.DiagramDesigner/ViewModels/SimpleViewModel/VideoItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleViewModel/VideoItemViewModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
 
-namespace Util.DiagramDesigner
+namespace AIStudio.Wpf.DiagramDesigner
 {
     public class VideoItemViewModel : MediaItemViewModel
     {
diff --git a/AIStudio.Wpf.BaseDiagram/AIStudio.Wpf.BaseDiagram.csproj b/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj
similarity index 91%
rename from AIStudio.Wpf.BaseDiagram/AIStudio.Wpf.BaseDiagram.csproj
rename to AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj
index 45d1a99..120ffc4 100644
--- a/AIStudio.Wpf.BaseDiagram/AIStudio.Wpf.BaseDiagram.csproj
+++ b/AIStudio.Wpf.DiagramHelper/AIStudio.Wpf.DiagramHelper.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,7 +13,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Util.DiagramDesigner\Util.DiagramDesigner.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramDesigner\AIStudio.Wpf.DiagramDesigner.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="zxing.core">
+      <HintPath>DLL\zxing.core.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
   <ItemGroup>
@@ -62,10 +68,4 @@
     </Page>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="zxing.core">
-      <HintPath>..\AIStudio.Wpf.ADiagram\zxing.core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/AIStudio.Wpf.BaseDiagram/ApplicationServicesProvider.cs b/AIStudio.Wpf.DiagramHelper/ApplicationServicesProvider.cs
similarity index 96%
rename from AIStudio.Wpf.BaseDiagram/ApplicationServicesProvider.cs
rename to AIStudio.Wpf.DiagramHelper/ApplicationServicesProvider.cs
index b273d9c..e8b0838 100644
--- a/AIStudio.Wpf.BaseDiagram/ApplicationServicesProvider.cs
+++ b/AIStudio.Wpf.DiagramHelper/ApplicationServicesProvider.cs
@@ -1,11 +1,11 @@
-using AIStudio.Wpf.BaseDiagram.Services;
+using AIStudio.Wpf.DiagramHelper.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.BaseDiagram
+namespace AIStudio.Wpf.DiagramHelper
 {
     /// <summary>
     /// Simple service interface
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/CanExecuteDelegateCommand.cs b/AIStudio.Wpf.DiagramHelper/Commands/CanExecuteDelegateCommand.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Commands/CanExecuteDelegateCommand.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/CanExecuteDelegateCommand.cs
index 931661b..538067a 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/CanExecuteDelegateCommand.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/CanExecuteDelegateCommand.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     /// <summary>
     ///     This class allows delegating the commanding logic to methods passed as parameters,
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/CommandReference.cs b/AIStudio.Wpf.DiagramHelper/Commands/CommandReference.cs
similarity index 97%
rename from AIStudio.Wpf.BaseDiagram/Commands/CommandReference.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/CommandReference.cs
index ad4e171..9bff12c 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/CommandReference.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/CommandReference.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     public class CommandReference : Freezable, ICommand
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/CompositeCommand.cs b/AIStudio.Wpf.DiagramHelper/Commands/CompositeCommand.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Commands/CompositeCommand.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/CompositeCommand.cs
index c8636cd..7962fdf 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/CompositeCommand.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/CompositeCommand.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     /// <summary>
     /// The CompositeCommand composes one or more ICommands.
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/ControlBinding.cs b/AIStudio.Wpf.DiagramHelper/Commands/ControlBinding.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Commands/ControlBinding.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/ControlBinding.cs
index 77b8bf5..fb7a6e6 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/ControlBinding.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/ControlBinding.cs
@@ -8,7 +8,7 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     [MarkupExtensionReturnType(typeof(object))]
     public class ControlBinding : MarkupExtension
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/ControlCommand.cs b/AIStudio.Wpf.DiagramHelper/Commands/ControlCommand.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Commands/ControlCommand.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/ControlCommand.cs
index 84aeebc..8eb63ea 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/ControlCommand.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/ControlCommand.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Controls;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     #region ConbrolCommand
 
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/DelegateCommand(T).cs b/AIStudio.Wpf.DiagramHelper/Commands/DelegateCommand(T).cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Commands/DelegateCommand(T).cs
rename to AIStudio.Wpf.DiagramHelper/Commands/DelegateCommand(T).cs
index 175c859..899b6c3 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/DelegateCommand(T).cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/DelegateCommand(T).cs
@@ -3,7 +3,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     /// <summary>
     /// An <see cref="ICommand"/> whose delegates can be attached for <see cref="Execute(T)"/> and <see cref="CanExecute(T)"/>.
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/DelegateCommand.cs b/AIStudio.Wpf.DiagramHelper/Commands/DelegateCommand.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Commands/DelegateCommand.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/DelegateCommand.cs
index 94228b8..016ba12 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/DelegateCommand.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/DelegateCommand.cs
@@ -5,7 +5,7 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     /// <summary>
     /// An <see cref="ICommand"/> whose delegates do not take any parameters for <see cref="Execute()"/> and <see cref="CanExecute()"/>.
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/DelegateCommandBase.cs b/AIStudio.Wpf.DiagramHelper/Commands/DelegateCommandBase.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Commands/DelegateCommandBase.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/DelegateCommandBase.cs
index 29c8a5a..68e00c5 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/DelegateCommandBase.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/DelegateCommandBase.cs
@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     /// <summary>
     /// An <see cref="ICommand"/> whose delegates can be attached for <see cref="Execute"/> and <see cref="CanExecute"/>.
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/IActiveAware.cs b/AIStudio.Wpf.DiagramHelper/Commands/IActiveAware.cs
similarity index 94%
rename from AIStudio.Wpf.BaseDiagram/Commands/IActiveAware.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/IActiveAware.cs
index 01b2016..9870c2d 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/IActiveAware.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/IActiveAware.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     /// <summary>
     /// Interface that defines if the object instance is active
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/PropertyObserver.cs b/AIStudio.Wpf.DiagramHelper/Commands/PropertyObserver.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Commands/PropertyObserver.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/PropertyObserver.cs
index c8d4620..ceabad5 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/PropertyObserver.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/PropertyObserver.cs
@@ -4,7 +4,7 @@ using System.ComponentModel;
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     /// <summary>
     /// Provide a way to observe property changes of INotifyPropertyChanged objects and invokes a 
diff --git a/AIStudio.Wpf.BaseDiagram/Commands/PropertyObserverNode.cs b/AIStudio.Wpf.DiagramHelper/Commands/PropertyObserverNode.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Commands/PropertyObserverNode.cs
rename to AIStudio.Wpf.DiagramHelper/Commands/PropertyObserverNode.cs
index 5685a5b..2737afe 100644
--- a/AIStudio.Wpf.BaseDiagram/Commands/PropertyObserverNode.cs
+++ b/AIStudio.Wpf.DiagramHelper/Commands/PropertyObserverNode.cs
@@ -6,7 +6,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.BaseDiagram.Commands
+namespace AIStudio.Wpf.DiagramHelper.Commands
 {
     /// <summary>
     /// Represents each node of nested properties expression and takes care of 
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/AnimationHelper.cs b/AIStudio.Wpf.DiagramHelper/Controls/AnimationHelper.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Controls/AnimationHelper.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/AnimationHelper.cs
index 040abea..00ce764 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/AnimationHelper.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/AnimationHelper.cs
@@ -5,7 +5,7 @@ using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
     /// <summary>
     ///     包含一些常用的动画辅助方法
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/Barcode.xaml b/AIStudio.Wpf.DiagramHelper/Controls/Barcode.xaml
similarity index 88%
rename from AIStudio.Wpf.BaseDiagram/Controls/Barcode.xaml
rename to AIStudio.Wpf.DiagramHelper/Controls/Barcode.xaml
index 2bebeaf..cf53611 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/Barcode.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Controls/Barcode.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="AIStudio.Wpf.BaseDiagram.Controls.Barcode"
+<UserControl x:Class="AIStudio.Wpf.DiagramHelper.Controls.Barcode"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/Barcode.xaml.cs b/AIStudio.Wpf.DiagramHelper/Controls/Barcode.xaml.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Controls/Barcode.xaml.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/Barcode.xaml.cs
index 705fa18..5c87c1f 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/Barcode.xaml.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/Barcode.xaml.cs
@@ -16,7 +16,7 @@ using WpfAnimatedGif;
 using ZXing;
 using ZXing.Presentation;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
     /// <summary>
     /// Barcode.xaml 的交互逻辑
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/GradientStopControl.xaml b/AIStudio.Wpf.DiagramHelper/Controls/GradientStopControl.xaml
similarity index 96%
rename from AIStudio.Wpf.BaseDiagram/Controls/GradientStopControl.xaml
rename to AIStudio.Wpf.DiagramHelper/Controls/GradientStopControl.xaml
index 869a7c5..ecf9e46 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/GradientStopControl.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Controls/GradientStopControl.xaml
@@ -1,12 +1,12 @@
-<UserControl x:Class="AIStudio.Wpf.BaseDiagram.Controls.GradientStopControl"
+<UserControl x:Class="AIStudio.Wpf.DiagramHelper.Controls.GradientStopControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
              xmlns:Fluent="urn:fluent-ribbon"
-             xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters"
-             xmlns:helper="clr-namespace:AIStudio.Wpf.BaseDiagram.Helpers"
+             xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters"
+             xmlns:helper="clr-namespace:AIStudio.Wpf.DiagramHelper.Helpers"
              xmlns:dd="https://astudio.github.io/diagram" 
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              mc:Ignorable="d" 
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/GradientStopControl.xaml.cs b/AIStudio.Wpf.DiagramHelper/Controls/GradientStopControl.xaml.cs
similarity index 85%
rename from AIStudio.Wpf.BaseDiagram/Controls/GradientStopControl.xaml.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/GradientStopControl.xaml.cs
index 71aea29..0fb3258 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/GradientStopControl.xaml.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/GradientStopControl.xaml.cs
@@ -12,9 +12,9 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
     /// <summary>
     /// GradientStopControl.xaml 的交互逻辑
@@ -36,7 +36,7 @@ namespace AIStudio.Wpf.BaseDiagram.Controls
             base.OnPreviewMouseDown(e);
 
             var element = (e.OriginalSource as FrameworkElement);
-            if (element.DataContext is Util.DiagramDesigner.GradientStop target)
+            if (element.DataContext is AIStudio.Wpf.DiagramDesigner.GradientStop target)
             {
                 ColorObject.SelectedGradientStop = target;
 
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/MultiSelectComboBox.xaml b/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Controls/MultiSelectComboBox.xaml
rename to AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml
index 5cd3236..e804df6 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/MultiSelectComboBox.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="AIStudio.Wpf.BaseDiagram.Controls.MultiSelectComboBox"
+<UserControl x:Class="AIStudio.Wpf.DiagramHelper.Controls.MultiSelectComboBox"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ComboBox Background="Transparent" BorderBrush="Transparent"
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/MultiSelectComboBox.xaml.cs b/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Controls/MultiSelectComboBox.xaml.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml.cs
index c2e6fd4..6fc047e 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/MultiSelectComboBox.xaml.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/MultiSelectComboBox.xaml.cs
@@ -14,10 +14,10 @@ using System.Windows.Shapes;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Collections;
-using AIStudio.Wpf.BaseDiagram.Helpers;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramHelper.Helpers;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
     /// <summary>
     /// Interaction logic for MultiSelectComboBox.xaml
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/OutlineText.cs b/AIStudio.Wpf.DiagramHelper/Controls/OutlineText.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Controls/OutlineText.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/OutlineText.cs
index 2decefa..431099d 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/OutlineText.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/OutlineText.cs
@@ -5,7 +5,7 @@ using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
     public class OutlineText : FrameworkElement
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/PopupWindow.xaml b/AIStudio.Wpf.DiagramHelper/Controls/PopupWindow.xaml
similarity index 94%
rename from AIStudio.Wpf.BaseDiagram/Controls/PopupWindow.xaml
rename to AIStudio.Wpf.DiagramHelper/Controls/PopupWindow.xaml
index e0807a8..429a388 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/PopupWindow.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Controls/PopupWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="AIStudio.Wpf.BaseDiagram.Controls.PopupWindow"
+<Window x:Class="AIStudio.Wpf.DiagramHelper.Controls.PopupWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="{Binding Title}" 
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/PopupWindow.xaml.cs b/AIStudio.Wpf.DiagramHelper/Controls/PopupWindow.xaml.cs
similarity index 94%
rename from AIStudio.Wpf.BaseDiagram/Controls/PopupWindow.xaml.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/PopupWindow.xaml.cs
index 050154f..7251e31 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/PopupWindow.xaml.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/PopupWindow.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
     /// <summary>
     /// PopupWindow.xaml 的交互逻辑
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/PropertiesView.xaml b/AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml
similarity index 93%
rename from AIStudio.Wpf.BaseDiagram/Controls/PropertiesView.xaml
rename to AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml
index 5ad1bfa..8c06995 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/PropertiesView.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="AIStudio.Wpf.BaseDiagram.Controls.PropertiesView"
+<UserControl x:Class="AIStudio.Wpf.DiagramHelper.Controls.PropertiesView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
@@ -7,7 +7,7 @@
 
             <ControlTemplate x:Key="validationErrorTemplate">
                 <DockPanel>
-                    <Image Source="/AIStudio.Wpf.BaseDiagram;component/Images/error.png" Height="16" Width="16"
+                    <Image Source="/AIStudio.Wpf.DiagramHelper;component/Images/error.png" Height="16" Width="16"
 							DockPanel.Dock="Right" Margin="-18,0,0,0"
 							ToolTip="{Binding ElementName=adorner,
                             Path=AdornedElement.(Validation.Errors)[0].ErrorContent}">
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/PropertiesView.xaml.cs b/AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Controls/PropertiesView.xaml.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml.cs
index d799a09..2e9e5c3 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/PropertiesView.xaml.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/PropertiesView.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Shapes;
 using System.ComponentModel;
 using System.Reflection;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
 	/// <summary>
 	/// Interaction logic for PropertiesView.xaml
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/RectangleGrid.cs b/AIStudio.Wpf.DiagramHelper/Controls/RectangleGrid.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Controls/RectangleGrid.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/RectangleGrid.cs
index d69bc9b..58fbead 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/RectangleGrid.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/RectangleGrid.cs
@@ -6,7 +6,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
     public class RectangleGridEventArgs
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/SliderRotation.xaml b/AIStudio.Wpf.DiagramHelper/Controls/SliderRotation.xaml
similarity index 93%
rename from AIStudio.Wpf.BaseDiagram/Controls/SliderRotation.xaml
rename to AIStudio.Wpf.DiagramHelper/Controls/SliderRotation.xaml
index 90bb07e..3040106 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/SliderRotation.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Controls/SliderRotation.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="AIStudio.Wpf.BaseDiagram.Controls.SliderRotation"
+<UserControl x:Class="AIStudio.Wpf.DiagramHelper.Controls.SliderRotation"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls"
+             xmlns:local="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" 
              Name="sliderRotation"
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/SliderRotation.xaml.cs b/AIStudio.Wpf.DiagramHelper/Controls/SliderRotation.xaml.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Controls/SliderRotation.xaml.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/SliderRotation.xaml.cs
index 544a8ad..26d6ac3 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/SliderRotation.xaml.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/SliderRotation.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
     /// <summary>
     /// SliderRotation.xaml 的交互逻辑
diff --git a/AIStudio.Wpf.BaseDiagram/Controls/WPFRuler.cs b/AIStudio.Wpf.DiagramHelper/Controls/WPFRuler.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Controls/WPFRuler.cs
rename to AIStudio.Wpf.DiagramHelper/Controls/WPFRuler.cs
index 9865f5c..a8ae35f 100644
--- a/AIStudio.Wpf.BaseDiagram/Controls/WPFRuler.cs
+++ b/AIStudio.Wpf.DiagramHelper/Controls/WPFRuler.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.BaseDiagram.Controls
+namespace AIStudio.Wpf.DiagramHelper.Controls
 {
     /// <summary>
     /// A ruler control which supports both centimeters and inches. In order to use it vertically, change the <see cref="Marks">Marks</see> property to <c>Up</c> and rotate it ninety degrees.
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/BoolVisibilityConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/BoolVisibilityConverter.cs
similarity index 96%
rename from AIStudio.Wpf.BaseDiagram/Converters/BoolVisibilityConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/BoolVisibilityConverter.cs
index c137e90..0e847c2 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/BoolVisibilityConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/BoolVisibilityConverter.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class BoolVisibilityConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/Boolean2VisibilityReConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/Boolean2VisibilityReConverter.cs
similarity index 92%
rename from AIStudio.Wpf.BaseDiagram/Converters/Boolean2VisibilityReConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/Boolean2VisibilityReConverter.cs
index 93906aa..aecfdec 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/Boolean2VisibilityReConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/Boolean2VisibilityReConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class Boolean2VisibilityReConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/ConverterBoolToValueMap.cs b/AIStudio.Wpf.DiagramHelper/Converters/ConverterBoolToValueMap.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Converters/ConverterBoolToValueMap.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/ConverterBoolToValueMap.cs
index 165af6a..25c46dc 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/ConverterBoolToValueMap.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/ConverterBoolToValueMap.cs
@@ -4,7 +4,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class ConverterBoolToValueMap : MarkupExtension, IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/ConverterValueMapSetToVisibility.cs b/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapSetToVisibility.cs
similarity index 97%
rename from AIStudio.Wpf.BaseDiagram/Converters/ConverterValueMapSetToVisibility.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapSetToVisibility.cs
index 5279786..bcfc687 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/ConverterValueMapSetToVisibility.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapSetToVisibility.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class ConverterValueMapSetToVisibility : MarkupExtension, IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/ConverterValueMapToBool.cs b/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToBool.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Converters/ConverterValueMapToBool.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToBool.cs
index 1411246..9fb54b0 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/ConverterValueMapToBool.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToBool.cs
@@ -4,7 +4,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class ConverterValueMapToBool : MarkupExtension, IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/ConverterValueMapToVisibility.cs b/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToVisibility.cs
similarity index 97%
rename from AIStudio.Wpf.BaseDiagram/Converters/ConverterValueMapToVisibility.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToVisibility.cs
index 0e22adb..f996ba1 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/ConverterValueMapToVisibility.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueMapToVisibility.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class ConverterValueMapToVisibility : MarkupExtension, IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/ConverterValueSetToOppositeVisibility.cs b/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueSetToOppositeVisibility.cs
similarity index 97%
rename from AIStudio.Wpf.BaseDiagram/Converters/ConverterValueSetToOppositeVisibility.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/ConverterValueSetToOppositeVisibility.cs
index 44ccb66..ac92867 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/ConverterValueSetToOppositeVisibility.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/ConverterValueSetToOppositeVisibility.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class ConverterValueSetToOppositeVisibility : MarkupExtension, IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/Converters.cs b/AIStudio.Wpf.DiagramHelper/Converters/Converters.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Converters/Converters.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/Converters.cs
index bac4b54..88453f1 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/Converters.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/Converters.cs
@@ -4,7 +4,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     #region Half 
     public class HalfConverter : IValueConverter
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/CountShiftConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/CountShiftConverter.cs
similarity index 86%
rename from AIStudio.Wpf.BaseDiagram/Converters/CountShiftConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/CountShiftConverter.cs
index fa8e823..e78e71f 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/CountShiftConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/CountShiftConverter.cs
@@ -2,10 +2,10 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
-using AIStudio.Wpf.BaseDiagram.Controls;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramHelper.Controls;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class CountShiftConverter : IMultiValueConverter
     {
@@ -13,7 +13,7 @@ namespace AIStudio.Wpf.BaseDiagram.Converters
         {
             if (values != null && values.Length > 2)
             {
-                var diagram = values[0] as Util.DiagramDesigner.DiagramControl;
+                var diagram = values[0] as AIStudio.Wpf.DiagramDesigner.DiagramControl;
                 var zoomValue = (double)values[1];
                 var pageunit = (PageUnit)values[2];
                 var unit = Unit.Cm;
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/DoubleToThickness.cs b/AIStudio.Wpf.DiagramHelper/Converters/DoubleToThickness.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Converters/DoubleToThickness.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/DoubleToThickness.cs
index 7355794..f88b0c9 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/DoubleToThickness.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/DoubleToThickness.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class DoubleToThickness : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/HtmlColorConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/HtmlColorConverter.cs
similarity index 97%
rename from AIStudio.Wpf.BaseDiagram/Converters/HtmlColorConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/HtmlColorConverter.cs
index 9fa65c3..05fef0b 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/HtmlColorConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/HtmlColorConverter.cs
@@ -21,7 +21,7 @@ using System.Text;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     class HtmlColorConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/IndentConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/IndentConverter.cs
similarity index 95%
rename from AIStudio.Wpf.BaseDiagram/Converters/IndentConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/IndentConverter.cs
index 488be28..3d0f3f8 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/IndentConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/IndentConverter.cs
@@ -9,7 +9,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class IndentConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/IntToBoolConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/IntToBoolConverter.cs
similarity index 92%
rename from AIStudio.Wpf.BaseDiagram/Converters/IntToBoolConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/IntToBoolConverter.cs
index 9e01348..306afc9 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/IntToBoolConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/IntToBoolConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class IntToBoolConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/IntVisibilityConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/IntVisibilityConverter.cs
similarity index 97%
rename from AIStudio.Wpf.BaseDiagram/Converters/IntVisibilityConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/IntVisibilityConverter.cs
index 76f4499..e4b0cd0 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/IntVisibilityConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/IntVisibilityConverter.cs
@@ -4,7 +4,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     //选中项索引转换成可见项
     public class IntVisibilityConverter : MarkupExtension, IValueConverter
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/NullableToBooleanConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/NullableToBooleanConverter.cs
similarity index 92%
rename from AIStudio.Wpf.BaseDiagram/Converters/NullableToBooleanConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/NullableToBooleanConverter.cs
index 57f7bd5..94f9d58 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/NullableToBooleanConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/NullableToBooleanConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class NullableToBooleanConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/NullableToVisibilityConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/NullableToVisibilityConverter.cs
similarity index 93%
rename from AIStudio.Wpf.BaseDiagram/Converters/NullableToVisibilityConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/NullableToVisibilityConverter.cs
index 23c611d..98cf0d2 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/NullableToVisibilityConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/NullableToVisibilityConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class NullableToVisibilityConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/NumberConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/NumberConverter.cs
similarity index 93%
rename from AIStudio.Wpf.BaseDiagram/Converters/NumberConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/NumberConverter.cs
index 11b2c02..4af3b62 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/NumberConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/NumberConverter.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class NumberConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/RulerUnitConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/RulerUnitConverter.cs
similarity index 86%
rename from AIStudio.Wpf.BaseDiagram/Converters/RulerUnitConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/RulerUnitConverter.cs
index 169e59f..0320813 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/RulerUnitConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/RulerUnitConverter.cs
@@ -1,13 +1,13 @@
-using AIStudio.Wpf.BaseDiagram.Controls;
+using AIStudio.Wpf.DiagramHelper.Controls;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class RulerUnitConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/StringPathConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/StringPathConverter.cs
similarity index 95%
rename from AIStudio.Wpf.BaseDiagram/Converters/StringPathConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/StringPathConverter.cs
index 82299c5..2c832aa 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/StringPathConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/StringPathConverter.cs
@@ -7,7 +7,7 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class StringPathConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/ThicknessBindingConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/ThicknessBindingConverter.cs
similarity index 98%
rename from AIStudio.Wpf.BaseDiagram/Converters/ThicknessBindingConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/ThicknessBindingConverter.cs
index 6ec8ed1..f0c786c 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/ThicknessBindingConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/ThicknessBindingConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     /// <summary>
     /// Converts a Thickness to a new Thickness. It's possible to ignore a side With the IgnoreThicknessSide property.
diff --git a/AIStudio.Wpf.BaseDiagram/Converters/ThicknessConverter.cs b/AIStudio.Wpf.DiagramHelper/Converters/ThicknessConverter.cs
similarity index 97%
rename from AIStudio.Wpf.BaseDiagram/Converters/ThicknessConverter.cs
rename to AIStudio.Wpf.DiagramHelper/Converters/ThicknessConverter.cs
index 2a019ff..1fcc38f 100644
--- a/AIStudio.Wpf.BaseDiagram/Converters/ThicknessConverter.cs
+++ b/AIStudio.Wpf.DiagramHelper/Converters/ThicknessConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace AIStudio.Wpf.BaseDiagram.Converters
+namespace AIStudio.Wpf.DiagramHelper.Converters
 {
     public class ThicknessToDoubleConverter : IValueConverter
     {
diff --git a/AIStudio.Wpf.ADiagram/zxing.core.dll b/AIStudio.Wpf.DiagramHelper/DLL/zxing.core.dll
similarity index 100%
rename from AIStudio.Wpf.ADiagram/zxing.core.dll
rename to AIStudio.Wpf.DiagramHelper/DLL/zxing.core.dll
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/Models/PathDesignerItem.cs b/AIStudio.Wpf.DiagramHelper/Extensions/Models/PathDesignerItem.cs
similarity index 68%
rename from AIStudio.Wpf.BaseDiagram/Extensions/Models/PathDesignerItem.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/Models/PathDesignerItem.cs
index 6936805..85b8a44 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/Models/PathDesignerItem.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/Models/PathDesignerItem.cs
@@ -1,6 +1,6 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.Models
+namespace AIStudio.Wpf.DiagramHelper.Extensions.Models
 {
     public class PathDesignerItem : DesignerItemBase
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/Models/PersistDesignerItem.cs b/AIStudio.Wpf.DiagramHelper/Extensions/Models/PersistDesignerItem.cs
similarity index 72%
rename from AIStudio.Wpf.BaseDiagram/Extensions/Models/PersistDesignerItem.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/Models/PersistDesignerItem.cs
index dfa31c1..6ce7abb 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/Models/PersistDesignerItem.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/Models/PersistDesignerItem.cs
@@ -1,8 +1,8 @@
 using System.Xml.Serialization;
-using Util.DiagramDesigner;
-using AIStudio.Wpf.BaseDiagram.Extensions.ViewModels;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramHelper.Extensions.ViewModels;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.Models
+namespace AIStudio.Wpf.DiagramHelper.Extensions.Models
 {
     public class PersistDesignerItem : DesignerItemBase
     {       
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/Models/SettingsDesignerItem.cs b/AIStudio.Wpf.DiagramHelper/Extensions/Models/SettingsDesignerItem.cs
similarity index 68%
rename from AIStudio.Wpf.BaseDiagram/Extensions/Models/SettingsDesignerItem.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/Models/SettingsDesignerItem.cs
index 4495ea9..2c35057 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/Models/SettingsDesignerItem.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/Models/SettingsDesignerItem.cs
@@ -1,7 +1,7 @@
-using Util.DiagramDesigner;
-using AIStudio.Wpf.BaseDiagram.Extensions.ViewModels;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramHelper.Extensions.ViewModels;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.Models
+namespace AIStudio.Wpf.DiagramHelper.Extensions.Models
 {
     public class SettingsDesignerItem : DesignerItemBase
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/BarcodeDesignerItemData.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemData.cs
similarity index 92%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/BarcodeDesignerItemData.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemData.cs
index 6671e0d..a5e7fe9 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/BarcodeDesignerItemData.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemData.cs
@@ -1,9 +1,9 @@
-using AIStudio.Wpf.BaseDiagram.Commands;
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Commands;
+using AIStudio.Wpf.DiagramHelper.Models;
 using System.Windows.Input;
 using ZXing;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     public class BarcodeDesignerItemData : TitleBindableBase
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs
similarity index 94%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs
index 646afe3..2c9419b 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.cs
@@ -1,9 +1,9 @@
-using AIStudio.Wpf.BaseDiagram.Services;
+using AIStudio.Wpf.DiagramHelper.Services;
 using System;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using ZXing;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     public class BarcodeDesignerItemViewModel : DesignerItemViewModelBase
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml
similarity index 91%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml
index 8c0046f..629d14b 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/BarcodeDesignerItemViewModel.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.BaseDiagram.Extensions.ViewModels" 
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels" 
                     xmlns:gif="http://wpfanimatedgif.codeplex.com" 
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters"
-                    xmlns:controls="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls"
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters"
+                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
                     xmlns:dd="https://astudio.github.io/diagram"
                     xmlns:Fluent="urn:fluent-ribbon"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
                     xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
 
     <converter:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/OutLineTextDesignerItemData.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemData.cs
similarity index 87%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/OutLineTextDesignerItemData.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemData.cs
index f99a80a..adf3df2 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/OutLineTextDesignerItemData.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemData.cs
@@ -1,7 +1,7 @@
-using AIStudio.Wpf.BaseDiagram.Models;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramHelper.Models;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     public class OutLineTextDesignerItemData : TitleBindableBase
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs
similarity index 93%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs
index 2bcd3d4..3e0b41c 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.cs
@@ -1,10 +1,10 @@
-using AIStudio.Wpf.BaseDiagram.Services;
+using AIStudio.Wpf.DiagramHelper.Services;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Media;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     public class OutLineTextDesignerItemViewModel : TextDesignerItemViewModel
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml
similarity index 93%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml
index 732044f..d74ff38 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/OutLineTextDesignerItemViewModel.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.BaseDiagram.Extensions.ViewModels" 
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels" 
                     xmlns:gif="http://wpfanimatedgif.codeplex.com" 
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters"
-                    xmlns:controls="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls"
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters"
+                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
                     xmlns:dd="https://astudio.github.io/diagram"
                     xmlns:Fluent="urn:fluent-ribbon"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
                     xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
 
     <converter:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
@@ -91,19 +91,19 @@
                 </Fluent:ComboBox>
                 <Fluent:ToggleButton KeyTip="B"
                                              x:Name="buttonBold"
-                                             Icon="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Images/Bold.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Images/Bold.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
                                              IsChecked="{Binding FontViewModel.FontWeight,Converter={converter:ConverterValueMapToBool Parameter='Regular'}, ConverterParameter='Bold'}"/>
                 <Fluent:ToggleButton x:Name="buttonItalic"
                                              KeyTip="I"
-                                             Icon="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Images/Italic.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Images/Italic.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
                                              IsChecked="{Binding FontViewModel.FontStyle,Converter={converter:ConverterValueMapToBool Parameter='Normal'}, ConverterParameter='Italic'}"/>
                 <Fluent:ToggleButton x:Name="buttonUnderline"
                                              KeyTip="U"
-                                             Icon="pack://application:,,,/AIStudio.Wpf.BaseDiagram;component/Images/Underline.png"
+                                             Icon="pack://application:,,,/AIStudio.Wpf.DiagramHelper;component/Images/Underline.png"
                                              HorizontalAlignment="Left"
                                              SizeDefinition="Small" 
                                              IsChecked="{Binding FontViewModel.Underline}"/>
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PathItemViewModel.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PathItemViewModel.cs
similarity index 80%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PathItemViewModel.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PathItemViewModel.cs
index 9438308..7e00616 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PathItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PathItemViewModel.cs
@@ -1,6 +1,6 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     public class PathItemViewModel : DesignerItemViewModelBase
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PathItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PathItemViewModel.xaml
similarity index 88%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PathItemViewModel.xaml
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PathItemViewModel.xaml
index 042c63b..06b4124 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PathItemViewModel.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PathItemViewModel.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
-                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.BaseDiagram.Extensions.ViewModels"
-                    xmlns:convent="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters">
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels"
+                    xmlns:convent="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters">
     <convent:StringPathConverter x:Key="stringPathConverter"/>
     <s:ColorBrushConverter x:Key="ColorBrushConverter" />
     <Brush x:Key="ItemStroke">#FFD69436</Brush>
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemData.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PersistDesignerItemData.cs
similarity index 89%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemData.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PersistDesignerItemData.cs
index b86dc26..9f676e4 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemData.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PersistDesignerItemData.cs
@@ -1,6 +1,6 @@
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Models;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     /// <summary>
     /// This is passed to the PopupWindow.xaml window, where a DataTemplate is used to provide the
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PersistDesignerItemViewModel.cs
similarity index 86%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PersistDesignerItemViewModel.cs
index 54f50a4..e7dae14 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PersistDesignerItemViewModel.cs
@@ -1,8 +1,8 @@
-using AIStudio.Wpf.BaseDiagram.Services;
-using Util.DiagramDesigner;
-using AIStudio.Wpf.BaseDiagram.Extensions.Models;
+using AIStudio.Wpf.DiagramHelper.Services;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramHelper.Extensions.Models;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     public class PersistDesignerItemViewModel : DesignerItemViewModelBase
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PersistDesignerItemViewModel.xaml
similarity index 90%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemViewModel.xaml
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PersistDesignerItemViewModel.xaml
index 91002d5..4c02418 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/PersistDesignerItemViewModel.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/PersistDesignerItemViewModel.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.BaseDiagram.Extensions.ViewModels" 
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels" 
                     xmlns:gif="http://wpfanimatedgif.codeplex.com" 
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters"
-                    xmlns:controls="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls"
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters"
+                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
                     xmlns:dd="https://astudio.github.io/diagram"
                     xmlns:Fluent="urn:fluent-ribbon"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
                     xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
 
     <converter:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
@@ -48,7 +48,7 @@
         <Grid>
             <Image IsHitTestVisible="False"
                     Stretch="Fill"
-                    Source="/AIStudio.Wpf.ADiagram;component/Images/Persist.png"
+                    Source="/AIStudio.Wpf.DiagramApp;component/Images/Persist.png"
                     Tag="setting" />
             <Button x:Name="btnSetting" HorizontalAlignment="Right"
                     VerticalAlignment="Bottom"
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemData.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemData.cs
similarity index 89%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemData.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemData.cs
index 7a3d489..1506f23 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemData.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemData.cs
@@ -1,6 +1,6 @@
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Models;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     /// <summary>
     /// This is passed to the PopupWindow.xaml window, where a DataTemplate is used to provide the
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.cs
similarity index 87%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.cs
index 396057b..02f6b37 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.cs
@@ -1,9 +1,9 @@
-using AIStudio.Wpf.BaseDiagram.Services;
+using AIStudio.Wpf.DiagramHelper.Services;
 using System;
-using Util.DiagramDesigner;
-using AIStudio.Wpf.BaseDiagram.Extensions.Models;
+using AIStudio.Wpf.DiagramDesigner;
+using AIStudio.Wpf.DiagramHelper.Extensions.Models;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     public class SettingsDesignerItemViewModel : DesignerItemViewModelBase
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml
similarity index 89%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml
index 435d0ef..2960bd4 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SettingsDesignerItemViewModel.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.BaseDiagram.Extensions.ViewModels" 
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels" 
                     xmlns:gif="http://wpfanimatedgif.codeplex.com" 
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters"
-                    xmlns:controls="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls"
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters"
+                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls"
                     xmlns:dd="https://astudio.github.io/diagram"
                     xmlns:Fluent="urn:fluent-ribbon"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
                     xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
 
     <converter:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
@@ -48,7 +48,7 @@
         <Grid>
             <Image IsHitTestVisible="False"
                     Stretch="Fill"
-                    Source="/AIStudio.Wpf.ADiagram;component/Images/Setting.png"
+                    Source="/AIStudio.Wpf.DiagramApp;component/Images/Setting.png"
                     Tag="setting" />
             <Button HorizontalAlignment="Right"
                     VerticalAlignment="Bottom"
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SvgDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.cs
similarity index 78%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SvgDesignerItemViewModel.cs
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.cs
index b33c789..f0a70bd 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SvgDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.cs
@@ -1,6 +1,6 @@
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Extensions.ViewModels
+namespace AIStudio.Wpf.DiagramHelper.Extensions.ViewModels
 {
     public class SvgDesignerItemViewModel: MediaItemViewModel
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SvgDesignerItemViewModel.xaml b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.xaml
similarity index 82%
rename from AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SvgDesignerItemViewModel.xaml
rename to AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.xaml
index c44c676..31b15c7 100644
--- a/AIStudio.Wpf.BaseDiagram/Extensions/ViewModels/SvgDesignerItemViewModel.xaml
+++ b/AIStudio.Wpf.DiagramHelper/Extensions/ViewModels/SvgDesignerItemViewModel.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
-                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.BaseDiagram.Extensions.ViewModels" 
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramHelper.Extensions.ViewModels" 
                     xmlns:svg="clr-namespace:Svg2XamlTestExtension;assembly=Svg2XamlTestExtension">
     <s:ColorBrushConverter x:Key="ColorBrushConverter" />
     
diff --git a/AIStudio.Wpf.BaseDiagram/Helpers/EnumHelper.cs b/AIStudio.Wpf.DiagramHelper/Helpers/EnumHelper.cs
similarity index 94%
rename from AIStudio.Wpf.BaseDiagram/Helpers/EnumHelper.cs
rename to AIStudio.Wpf.DiagramHelper/Helpers/EnumHelper.cs
index 09591f5..0883a6d 100644
--- a/AIStudio.Wpf.BaseDiagram/Helpers/EnumHelper.cs
+++ b/AIStudio.Wpf.DiagramHelper/Helpers/EnumHelper.cs
@@ -5,9 +5,9 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Helpers
+namespace AIStudio.Wpf.DiagramHelper.Helpers
 {
     public class EnumHelper : DependencyObject
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Helpers/NewNameHelper.cs b/AIStudio.Wpf.DiagramHelper/Helpers/NewNameHelper.cs
similarity index 97%
rename from AIStudio.Wpf.BaseDiagram/Helpers/NewNameHelper.cs
rename to AIStudio.Wpf.DiagramHelper/Helpers/NewNameHelper.cs
index 4c12d14..6c33d40 100644
--- a/AIStudio.Wpf.BaseDiagram/Helpers/NewNameHelper.cs
+++ b/AIStudio.Wpf.DiagramHelper/Helpers/NewNameHelper.cs
@@ -7,7 +7,7 @@ using System.Security;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.BaseDiagram.Helpers
+namespace AIStudio.Wpf.DiagramHelper.Helpers
 {
     public class NewNameHelper
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Helpers/TypeHelper.cs b/AIStudio.Wpf.DiagramHelper/Helpers/TypeHelper.cs
similarity index 96%
rename from AIStudio.Wpf.BaseDiagram/Helpers/TypeHelper.cs
rename to AIStudio.Wpf.DiagramHelper/Helpers/TypeHelper.cs
index 33ca3c7..19434a2 100644
--- a/AIStudio.Wpf.BaseDiagram/Helpers/TypeHelper.cs
+++ b/AIStudio.Wpf.DiagramHelper/Helpers/TypeHelper.cs
@@ -5,7 +5,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.BaseDiagram.Helpers
+namespace AIStudio.Wpf.DiagramHelper.Helpers
 {
     public class TypeHelper
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Helpers/XmlSerializeHelper.cs b/AIStudio.Wpf.DiagramHelper/Helpers/XmlSerializeHelper.cs
similarity index 95%
rename from AIStudio.Wpf.BaseDiagram/Helpers/XmlSerializeHelper.cs
rename to AIStudio.Wpf.DiagramHelper/Helpers/XmlSerializeHelper.cs
index c9031e9..0df6a2f 100644
--- a/AIStudio.Wpf.BaseDiagram/Helpers/XmlSerializeHelper.cs
+++ b/AIStudio.Wpf.DiagramHelper/Helpers/XmlSerializeHelper.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 
-namespace AIStudio.Wpf.BaseDiagram.Helpers
+namespace AIStudio.Wpf.DiagramHelper.Helpers
 {
     public class XmlSerializeHelper
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Models/TitleBindableBase.cs b/AIStudio.Wpf.DiagramHelper/Models/TitleBindableBase.cs
similarity index 84%
rename from AIStudio.Wpf.BaseDiagram/Models/TitleBindableBase.cs
rename to AIStudio.Wpf.DiagramHelper/Models/TitleBindableBase.cs
index a47f18c..023fa8b 100644
--- a/AIStudio.Wpf.BaseDiagram/Models/TitleBindableBase.cs
+++ b/AIStudio.Wpf.DiagramHelper/Models/TitleBindableBase.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
-namespace AIStudio.Wpf.BaseDiagram.Models
+namespace AIStudio.Wpf.DiagramHelper.Models
 {
     public class TitleBindableBase : BindableBase
     {
diff --git a/AIStudio.Wpf.BaseDiagram/Services/IMessageBoxService.cs b/AIStudio.Wpf.DiagramHelper/Services/IMessageBoxService.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Services/IMessageBoxService.cs
rename to AIStudio.Wpf.DiagramHelper/Services/IMessageBoxService.cs
index 557c88c..a6f118f 100644
--- a/AIStudio.Wpf.BaseDiagram/Services/IMessageBoxService.cs
+++ b/AIStudio.Wpf.DiagramHelper/Services/IMessageBoxService.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.BaseDiagram.Services
+namespace AIStudio.Wpf.DiagramHelper.Services
 {
     /// <summary>
     /// Available Button options. 
diff --git a/AIStudio.Wpf.BaseDiagram/Services/IUIVisualizerService.cs b/AIStudio.Wpf.DiagramHelper/Services/IUIVisualizerService.cs
similarity index 93%
rename from AIStudio.Wpf.BaseDiagram/Services/IUIVisualizerService.cs
rename to AIStudio.Wpf.DiagramHelper/Services/IUIVisualizerService.cs
index f202918..4bb696c 100644
--- a/AIStudio.Wpf.BaseDiagram/Services/IUIVisualizerService.cs
+++ b/AIStudio.Wpf.DiagramHelper/Services/IUIVisualizerService.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AIStudio.Wpf.BaseDiagram.Services
+namespace AIStudio.Wpf.DiagramHelper.Services
 {
     /// <summary>
     /// This interface defines a UI controller which can be used to display dialogs
diff --git a/AIStudio.Wpf.BaseDiagram/Services/WPFMessageBoxService.cs b/AIStudio.Wpf.DiagramHelper/Services/WPFMessageBoxService.cs
similarity index 99%
rename from AIStudio.Wpf.BaseDiagram/Services/WPFMessageBoxService.cs
rename to AIStudio.Wpf.DiagramHelper/Services/WPFMessageBoxService.cs
index b5c02cc..5239906 100644
--- a/AIStudio.Wpf.BaseDiagram/Services/WPFMessageBoxService.cs
+++ b/AIStudio.Wpf.DiagramHelper/Services/WPFMessageBoxService.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace AIStudio.Wpf.BaseDiagram.Services
+namespace AIStudio.Wpf.DiagramHelper.Services
 {
     /// <summary>
     /// This class implements the IMessageBoxService for WPF purposes.
diff --git a/AIStudio.Wpf.BaseDiagram/Services/WPFUIVisualizerService.cs b/AIStudio.Wpf.DiagramHelper/Services/WPFUIVisualizerService.cs
similarity index 90%
rename from AIStudio.Wpf.BaseDiagram/Services/WPFUIVisualizerService.cs
rename to AIStudio.Wpf.DiagramHelper/Services/WPFUIVisualizerService.cs
index eae5449..6a81c3a 100644
--- a/AIStudio.Wpf.BaseDiagram/Services/WPFUIVisualizerService.cs
+++ b/AIStudio.Wpf.DiagramHelper/Services/WPFUIVisualizerService.cs
@@ -1,4 +1,4 @@
-using AIStudio.Wpf.BaseDiagram.Controls;
+using AIStudio.Wpf.DiagramHelper.Controls;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace AIStudio.Wpf.BaseDiagram.Services
+namespace AIStudio.Wpf.DiagramHelper.Services
 {
     public class WPFUIVisualizerService : IUIVisualizerService
     {
diff --git a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj b/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj
index 3ca3d38..5e54e3e 100644
--- a/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj
+++ b/AIStudio.Wpf.Flowchart/AIStudio.Wpf.Flowchart.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
@@ -10,13 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AIStudio.Wpf.BaseDiagram\AIStudio.Wpf.BaseDiagram.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Update="ViewModels\FlowNode.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/AIStudio.Wpf.Flowchart/FlowchartService.cs b/AIStudio.Wpf.Flowchart/FlowchartService.cs
index c7fecad..c500472 100644
--- a/AIStudio.Wpf.Flowchart/FlowchartService.cs
+++ b/AIStudio.Wpf.Flowchart/FlowchartService.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 using Expression = org.mariuszgromada.math.mxparser.Expression;
 
 namespace AIStudio.Wpf.Flowchart
@@ -192,7 +192,7 @@ namespace AIStudio.Wpf.Flowchart
                             if (middleFlowNode.UserIds != null && middleFlowNode.UserIds.Count > 1)
                             {
                                 //实际情况不是这样的，这里只是演示，简化。
-                                int count = remark.Split("审批人：", StringSplitOptions.RemoveEmptyEntries).Length;
+                                int count = remark.Split(new String[] { "审批人：" }, StringSplitOptions.RemoveEmptyEntries).Length;
                                 if (middleFlowNode.UserIds.Count != count)
                                 {
                                     SetStatus(flowNode, 1, remark);
@@ -202,7 +202,7 @@ namespace AIStudio.Wpf.Flowchart
                             else if (middleFlowNode.RoleIds != null && middleFlowNode.RoleIds.Count > 1)
                             {
                                 //实际情况不是这样的，这里只是演示，简化。
-                                int count = remark.Split("审批人：", StringSplitOptions.RemoveEmptyEntries).Length;
+                                int count = remark.Split(new String[] { "审批人：" }, StringSplitOptions.RemoveEmptyEntries).Length;
                                 if (middleFlowNode.RoleIds.Count != count)
                                 {
                                     SetStatus(flowNode, 1, remark);
diff --git a/AIStudio.Wpf.Flowchart/Models/FlowNodeDesignerItem.cs b/AIStudio.Wpf.Flowchart/Models/FlowNodeDesignerItem.cs
index 5c28167..fd537b6 100644
--- a/AIStudio.Wpf.Flowchart/Models/FlowNodeDesignerItem.cs
+++ b/AIStudio.Wpf.Flowchart/Models/FlowNodeDesignerItem.cs
@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Xml.Serialization;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Flowchart.Models
 {
diff --git a/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs b/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs
index 0113e88..50170c1 100644
--- a/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs
+++ b/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.cs
@@ -1,9 +1,9 @@
-using AIStudio.Wpf.BaseDiagram;
-using AIStudio.Wpf.BaseDiagram.Services;
+using AIStudio.Wpf.DiagramHelper;
+using AIStudio.Wpf.DiagramHelper.Services;
 using AIStudio.Wpf.Flowchart.Models;
 using System.Collections.Generic;
 using System.ComponentModel;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Flowchart.ViewModels
 {
diff --git a/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.xaml b/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.xaml
index e745367..de87280 100644
--- a/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.xaml
+++ b/AIStudio.Wpf.Flowchart/ViewModels/FlowNode.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
                     xmlns:viewmodel="clr-namespace:AIStudio.Wpf.Flowchart.ViewModels"
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters;assembly=AIStudio.Wpf.BaseDiagram">
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper">
 
     <s:ColorBrushConverter x:Key="ColorBrushConverter"/>
 
diff --git a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs b/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs
index 7a886a0..e5d8d8f 100644
--- a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs
+++ b/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNode.cs
@@ -1,8 +1,8 @@
-using AIStudio.Wpf.BaseDiagram.Controls;
+using AIStudio.Wpf.DiagramHelper.Controls;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Flowchart.ViewModels
 {
diff --git a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs b/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs
index f1f245f..8595563 100644
--- a/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs
+++ b/AIStudio.Wpf.Flowchart/ViewModels/MiddleFlowNodeData.cs
@@ -1,4 +1,4 @@
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Models;
 
 namespace AIStudio.Wpf.Flowchart.ViewModels
 {
diff --git a/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj b/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj
index 4a76d9d..2d4aae7 100644
--- a/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj
+++ b/AIStudio.Wpf.Logical/AIStudio.Wpf.Logical.csproj
@@ -1,18 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AIStudio.Wpf.BaseDiagram\AIStudio.Wpf.BaseDiagram.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Update="ViewModels\LogicalGateItemViewModel.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/AIStudio.Wpf.Logical/LinkPoint.cs b/AIStudio.Wpf.Logical/LinkPoint.cs
index 18dea8b..e46fa74 100644
--- a/AIStudio.Wpf.Logical/LinkPoint.cs
+++ b/AIStudio.Wpf.Logical/LinkPoint.cs
@@ -1,5 +1,5 @@
 using System;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Logical
 {
diff --git a/AIStudio.Wpf.Logical/Models/LogicalGateItem.cs b/AIStudio.Wpf.Logical/Models/LogicalGateItem.cs
index 4b48f1b..775dfe1 100644
--- a/AIStudio.Wpf.Logical/Models/LogicalGateItem.cs
+++ b/AIStudio.Wpf.Logical/Models/LogicalGateItem.cs
@@ -1,5 +1,5 @@
 using AIStudio.Wpf.Logical.ViewModels;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Logical.Models
 {
diff --git a/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs b/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs
index 04c3311..4ef9727 100644
--- a/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs
+++ b/AIStudio.Wpf.Logical/ViewModels/LinkPointDesignerItemData.cs
@@ -1,4 +1,4 @@
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Models;
 
 namespace AIStudio.Wpf.Logical.ViewModels
 {
diff --git a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs
index 18972fd..26f05ef 100644
--- a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs
+++ b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemData.cs
@@ -1,7 +1,7 @@
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Models;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Logical.ViewModels
 {
diff --git a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs
index cf942e6..8224b94 100644
--- a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs
+++ b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.cs
@@ -1,10 +1,10 @@
-using AIStudio.Wpf.BaseDiagram;
-using AIStudio.Wpf.BaseDiagram.Services;
+using AIStudio.Wpf.DiagramHelper;
+using AIStudio.Wpf.DiagramHelper.Services;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Media;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.Logical.ViewModels
 {
diff --git a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.xaml b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.xaml
index d5e9f39..e150e71 100644
--- a/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.xaml
+++ b/AIStudio.Wpf.Logical/ViewModels/LogicalGateItemViewModel.xaml
@@ -3,11 +3,11 @@
                     xmlns:local="clr-namespace:AIStudio.Wpf.Logical" 
                     xmlns:viewmodel="clr-namespace:AIStudio.Wpf.Logical.ViewModels" 
                     xmlns:gif="http://wpfanimatedgif.codeplex.com" 
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters;assembly=AIStudio.Wpf.BaseDiagram"
-                    xmlns:controls="clr-namespace:AIStudio.Wpf.BaseDiagram.Controls;assembly=AIStudio.Wpf.BaseDiagram"
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper"
+                    xmlns:controls="clr-namespace:AIStudio.Wpf.DiagramHelper.Controls;assembly=AIStudio.Wpf.DiagramHelper"
                     xmlns:dd="https://astudio.github.io/diagram"
                     xmlns:Fluent="urn:fluent-ribbon"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
                     xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
 
     <converter:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
diff --git a/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs b/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs
index 3852cf5..32fdee6 100644
--- a/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs
+++ b/AIStudio.Wpf.Logical/ViewModels/ValueDesignerItemData.cs
@@ -1,4 +1,4 @@
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Models;
 
 namespace AIStudio.Wpf.Logical.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj b/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj
index dd8b1e4..5e54e3e 100644
--- a/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj
+++ b/AIStudio.Wpf.SFC/AIStudio.Wpf.SFC.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
@@ -10,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\AIStudio.Wpf.BaseDiagram\AIStudio.Wpf.BaseDiagram.csproj" />
+    <ProjectReference Include="..\AIStudio.Wpf.DiagramHelper\AIStudio.Wpf.DiagramHelper.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/AIStudio.Wpf.SFC/LinkPoint.cs b/AIStudio.Wpf.SFC/LinkPoint.cs
index 315dfa5..69ddb8d 100644
--- a/AIStudio.Wpf.SFC/LinkPoint.cs
+++ b/AIStudio.Wpf.SFC/LinkPoint.cs
@@ -1,5 +1,5 @@
 using System;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC
 {
diff --git a/AIStudio.Wpf.SFC/Models/SFCNodeDesignerItem.cs b/AIStudio.Wpf.SFC/Models/SFCNodeDesignerItem.cs
index 742d490..8f50889 100644
--- a/AIStudio.Wpf.SFC/Models/SFCNodeDesignerItem.cs
+++ b/AIStudio.Wpf.SFC/Models/SFCNodeDesignerItem.cs
@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Xml.Serialization;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.Models
 {
diff --git a/AIStudio.Wpf.SFC/SFCService.cs b/AIStudio.Wpf.SFC/SFCService.cs
index ca0dc76..4b6e9f2 100644
--- a/AIStudio.Wpf.SFC/SFCService.cs
+++ b/AIStudio.Wpf.SFC/SFCService.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCActionNode.cs b/AIStudio.Wpf.SFC/ViewModels/SFCActionNode.cs
index b64329a..a81bbcd 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCActionNode.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCActionNode.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs b/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs
index 32ce60f..91897b4 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCActionNodeData.cs
@@ -1,10 +1,10 @@
-using AIStudio.Wpf.BaseDiagram.Commands;
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Commands;
+using AIStudio.Wpf.DiagramHelper.Models;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows.Input;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCCOBeginNode.cs b/AIStudio.Wpf.SFC/ViewModels/SFCCOBeginNode.cs
index 479a37e..ac9a422 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCCOBeginNode.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCCOBeginNode.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCCOEndNode.cs b/AIStudio.Wpf.SFC/ViewModels/SFCCOEndNode.cs
index e08f4c4..15c5a65 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCCOEndNode.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCCOEndNode.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCConditionNode.cs b/AIStudio.Wpf.SFC/ViewModels/SFCConditionNode.cs
index 8184f7e..9aefffc 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCConditionNode.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCConditionNode.cs
@@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Windows.Media;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs b/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs
index d9a00b7..e550811 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCConditionNodeData.cs
@@ -1,10 +1,10 @@
-using AIStudio.Wpf.BaseDiagram.Commands;
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Commands;
+using AIStudio.Wpf.DiagramHelper.Models;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows.Input;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs b/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs
index 1959bb1..a526a33 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCNode.cs
@@ -1,5 +1,5 @@
-using AIStudio.Wpf.BaseDiagram;
-using AIStudio.Wpf.BaseDiagram.Services;
+using AIStudio.Wpf.DiagramHelper;
+using AIStudio.Wpf.DiagramHelper.Services;
 using AIStudio.Wpf.SFC.Models;
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Windows.Media;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCNode.xaml b/AIStudio.Wpf.SFC/ViewModels/SFCNode.xaml
index 5a9abc3..928bdd2 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCNode.xaml
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCNode.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:Util.DiagramDesigner;assembly=Util.DiagramDesigner"
+                    xmlns:s="clr-namespace:AIStudio.Wpf.DiagramDesigner;assembly=AIStudio.Wpf.DiagramDesigner"
                     xmlns:viewmodel="clr-namespace:AIStudio.Wpf.SFC.ViewModels"
                     xmlns:local="clr-namespace:AIStudio.Wpf.SFC"
-                    xmlns:converter="clr-namespace:AIStudio.Wpf.BaseDiagram.Converters;assembly=AIStudio.Wpf.BaseDiagram">
+                    xmlns:converter="clr-namespace:AIStudio.Wpf.DiagramHelper.Converters;assembly=AIStudio.Wpf.DiagramHelper">
 
     <s:ColorBrushConverter x:Key="ColorBrushConverter"/>
     <converter:HalfConverter x:Key="HalfConverter"/>
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCNodeNode.cs b/AIStudio.Wpf.SFC/ViewModels/SFCNodeNode.cs
index fd487e3..c4a825a 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCNodeNode.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCNodeNode.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/SFCStartNode.cs b/AIStudio.Wpf.SFC/ViewModels/SFCStartNode.cs
index e23e043..6df37c5 100644
--- a/AIStudio.Wpf.SFC/ViewModels/SFCStartNode.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/SFCStartNode.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_ListViewModel.cs b/AIStudio.Wpf.SFC/ViewModels/Simulate_ListViewModel.cs
index 0010550..c23dd78 100644
--- a/AIStudio.Wpf.SFC/ViewModels/Simulate_ListViewModel.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/Simulate_ListViewModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModel.cs b/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModel.cs
index 201db84..d6d8164 100644
--- a/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModel.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Reactive.Linq;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs b/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs
index 75cc3f0..f63ede2 100644
--- a/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/Simulate_SolenoidViewModelData.cs
@@ -1,8 +1,8 @@
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Models;
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_StartViewModel.cs b/AIStudio.Wpf.SFC/ViewModels/Simulate_StartViewModel.cs
index 58fd6eb..526d2d4 100644
--- a/AIStudio.Wpf.SFC/ViewModels/Simulate_StartViewModel.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/Simulate_StartViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModel.cs b/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModel.cs
index 91f97c7..5cea653 100644
--- a/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModel.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs b/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs
index 3b9a22c..793a860 100644
--- a/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs
+++ b/AIStudio.Wpf.SFC/ViewModels/Simulate_TankViewModelData.cs
@@ -1,8 +1,8 @@
-using AIStudio.Wpf.BaseDiagram.Models;
+using AIStudio.Wpf.DiagramHelper.Models;
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Util.DiagramDesigner;
+using AIStudio.Wpf.DiagramDesigner;
 
 namespace AIStudio.Wpf.SFC.ViewModels
 {
diff --git a/Directory.Build.Props b/Directory.Build.Props
new file mode 100644
index 0000000..801ea2a
--- /dev/null
+++ b/Directory.Build.Props
@@ -0,0 +1,16 @@
+<Project>
+  <!-- Project properties -->
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.1;net461;net5.0-windows</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;CS1591;SA1652;WPF0041</NoWarn>
+  </PropertyGroup>
+  
+  <!-- Add the references for all projects and targets -->
+  <ItemGroup>
+    <PackageReference Include="WpfAnalyzers" Version="3.5.*" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file