diff --git a/Avalonia.Themes.Semi.sln b/Avalonia.Themes.Semi.sln
deleted file mode 100644
index 3ca8ff3..0000000
--- a/Avalonia.Themes.Semi.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32929.385
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Semi", "src\Avalonia.Themes.Semi\Avalonia.Themes.Semi.csproj", "{807DB45D-14B8-4238-A9F2-24C530BE9F7A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Demo", "src\Semi.Demo\Semi.Demo.csproj", "{9BD82D56-2330-4592-9275-C78BAF956045}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{807DB45D-14B8-4238-A9F2-24C530BE9F7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{807DB45D-14B8-4238-A9F2-24C530BE9F7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{807DB45D-14B8-4238-A9F2-24C530BE9F7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{807DB45D-14B8-4238-A9F2-24C530BE9F7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9BD82D56-2330-4592-9275-C78BAF956045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BD82D56-2330-4592-9275-C78BAF956045}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BD82D56-2330-4592-9275-C78BAF956045}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9BD82D56-2330-4592-9275-C78BAF956045}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7CA41ED3-2CED-40CC-AA21-28C3B42B1E86}
-	EndGlobalSection
-EndGlobal
diff --git a/Semi.Avalonia.sln b/Semi.Avalonia.sln
new file mode 100644
index 0000000..43979a1
--- /dev/null
+++ b/Semi.Avalonia.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia", "src\Semi.Avalonia\Semi.Avalonia.csproj", "{90D0B063-BC64-40AB-A56C-AC11909CF410}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.Demo", "src\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj", "{799F311A-7376-4C90-B468-B7E7FFC1AF59}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Release|Any CPU.Build.0 = Release|Any CPU
+		{799F311A-7376-4C90-B468-B7E7FFC1AF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{799F311A-7376-4C90-B468-B7E7FFC1AF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{799F311A-7376-4C90-B468-B7E7FFC1AF59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{799F311A-7376-4C90-B468-B7E7FFC1AF59}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7CA41ED3-2CED-40CC-AA21-28C3B42B1E86}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Avalonia.Themes.Semi/Themes/Light/Light.axaml b/src/Avalonia.Themes.Semi/Themes/Light/Light.axaml
deleted file mode 100644
index 89bc5da..0000000
--- a/src/Avalonia.Themes.Semi/Themes/Light/Light.axaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Light/Palette.axaml"/>
-        <!-- Controls -->
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Light/Button.axaml"/>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Light/Window.axaml"/>
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
diff --git a/src/Semi.Demo/.gitignore b/src/Semi.Avalonia.Demo/.gitignore
similarity index 100%
rename from src/Semi.Demo/.gitignore
rename to src/Semi.Avalonia.Demo/.gitignore
diff --git a/src/Semi.Demo/App.axaml b/src/Semi.Avalonia.Demo/App.axaml
similarity index 75%
rename from src/Semi.Demo/App.axaml
rename to src/Semi.Avalonia.Demo/App.axaml
index 208988f..dee4770 100644
--- a/src/Semi.Demo/App.axaml
+++ b/src/Semi.Avalonia.Demo/App.axaml
@@ -1,13 +1,13 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Semi.Demo.App">
+             x:Class="Semi.Avalonia.Demo.App">
     <Application.Styles>
         
     </Application.Styles>
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/DarkTheme.axaml"/>
+                <ResourceInclude Source="avares://Semi.Avalonia/Themes/DarkTheme.axaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/Semi.Demo/App.axaml.cs b/src/Semi.Avalonia.Demo/App.axaml.cs
similarity index 95%
rename from src/Semi.Demo/App.axaml.cs
rename to src/Semi.Avalonia.Demo/App.axaml.cs
index 0c60846..8afcd9a 100644
--- a/src/Semi.Demo/App.axaml.cs
+++ b/src/Semi.Avalonia.Demo/App.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
-namespace Semi.Demo
+namespace Semi.Avalonia.Demo
 {
     public partial class App : Application
     {
diff --git a/src/Semi.Demo/MainWindow.axaml b/src/Semi.Avalonia.Demo/MainWindow.axaml
similarity index 90%
rename from src/Semi.Demo/MainWindow.axaml
rename to src/Semi.Avalonia.Demo/MainWindow.axaml
index 1cf923b..3ff4055 100644
--- a/src/Semi.Demo/MainWindow.axaml
+++ b/src/Semi.Avalonia.Demo/MainWindow.axaml
@@ -3,7 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="Semi.Demo.MainWindow"
+        x:Class="Semi.Avalonia.Demo.MainWindow"
         Title="Semi.Demo">
     <StackPanel>
         <Button>Primary</Button>
diff --git a/src/Semi.Demo/MainWindow.axaml.cs b/src/Semi.Avalonia.Demo/MainWindow.axaml.cs
similarity index 85%
rename from src/Semi.Demo/MainWindow.axaml.cs
rename to src/Semi.Avalonia.Demo/MainWindow.axaml.cs
index 4834618..9f969bb 100644
--- a/src/Semi.Demo/MainWindow.axaml.cs
+++ b/src/Semi.Avalonia.Demo/MainWindow.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Semi.Demo
+namespace Semi.Avalonia.Demo
 {
     public partial class MainWindow : Window
     {
diff --git a/src/Semi.Demo/Program.cs b/src/Semi.Avalonia.Demo/Program.cs
similarity index 95%
rename from src/Semi.Demo/Program.cs
rename to src/Semi.Avalonia.Demo/Program.cs
index 13a36c6..d490a7f 100644
--- a/src/Semi.Demo/Program.cs
+++ b/src/Semi.Avalonia.Demo/Program.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using System;
 
-namespace Semi.Demo
+namespace Semi.Avalonia.Demo
 {
     class Program
     {
diff --git a/src/Semi.Demo/Semi.Demo.csproj b/src/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
similarity index 94%
rename from src/Semi.Demo/Semi.Demo.csproj
rename to src/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
index c1db83a..dff342f 100644
--- a/src/Semi.Demo/Semi.Demo.csproj
+++ b/src/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
@@ -25,6 +25,6 @@
         <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
     </ItemGroup>
     <ItemGroup>
-      <ProjectReference Include="..\Avalonia.Themes.Semi\Avalonia.Themes.Semi.csproj" />
+      <ProjectReference Include="..\Semi.Avalonia\Semi.Avalonia.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Themes.Semi/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Controls/Button.axaml
rename to src/Semi.Avalonia/Controls/Button.axaml
diff --git a/src/Avalonia.Themes.Semi/Controls/Controls.axaml b/src/Semi.Avalonia/Controls/Controls.axaml
similarity index 50%
rename from src/Avalonia.Themes.Semi/Controls/Controls.axaml
rename to src/Semi.Avalonia/Controls/Controls.axaml
index 25c1bad..352e9bc 100644
--- a/src/Avalonia.Themes.Semi/Controls/Controls.axaml
+++ b/src/Semi.Avalonia/Controls/Controls.axaml
@@ -2,8 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- Add Resources Here -->
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Controls/Button.axaml"/>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Controls/UserControl.axaml"/>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Controls/Window.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Button.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/UserControl.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Window.axaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Semi/Controls/UserControl.axaml b/src/Semi.Avalonia/Controls/UserControl.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Controls/UserControl.axaml
rename to src/Semi.Avalonia/Controls/UserControl.axaml
diff --git a/src/Avalonia.Themes.Semi/Controls/Window.axaml b/src/Semi.Avalonia/Controls/Window.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Controls/Window.axaml
rename to src/Semi.Avalonia/Controls/Window.axaml
diff --git a/src/Avalonia.Themes.Semi/Avalonia.Themes.Semi.csproj b/src/Semi.Avalonia/Semi.Avalonia.csproj
similarity index 100%
rename from src/Avalonia.Themes.Semi/Avalonia.Themes.Semi.csproj
rename to src/Semi.Avalonia/Semi.Avalonia.csproj
diff --git a/src/Avalonia.Themes.Semi/Themes/Base.axaml b/src/Semi.Avalonia/Themes/Base.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Themes/Base.axaml
rename to src/Semi.Avalonia/Themes/Base.axaml
diff --git a/src/Avalonia.Themes.Semi/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Themes/Dark/Button.axaml
rename to src/Semi.Avalonia/Themes/Dark/Button.axaml
diff --git a/src/Avalonia.Themes.Semi/Themes/Dark/Dark.axaml b/src/Semi.Avalonia/Themes/Dark/Dark.axaml
similarity index 52%
rename from src/Avalonia.Themes.Semi/Themes/Dark/Dark.axaml
rename to src/Semi.Avalonia/Themes/Dark/Dark.axaml
index cd4d53d..f82c807 100644
--- a/src/Avalonia.Themes.Semi/Themes/Dark/Dark.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Dark.axaml
@@ -2,9 +2,9 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- Add Resources Here -->
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Dark/Palette.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Palette.axaml"/>
         <!-- Controls -->
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Dark/Button.axaml"/>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Dark/Window.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Button.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Window.axaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Semi/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Themes/Dark/Palette.axaml
rename to src/Semi.Avalonia/Themes/Dark/Palette.axaml
diff --git a/src/Avalonia.Themes.Semi/Themes/Dark/Window.axaml b/src/Semi.Avalonia/Themes/Dark/Window.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Themes/Dark/Window.axaml
rename to src/Semi.Avalonia/Themes/Dark/Window.axaml
diff --git a/src/Avalonia.Themes.Semi/Themes/DarkTheme.axaml b/src/Semi.Avalonia/Themes/DarkTheme.axaml
similarity index 51%
rename from src/Avalonia.Themes.Semi/Themes/DarkTheme.axaml
rename to src/Semi.Avalonia/Themes/DarkTheme.axaml
index e012973..bd31c4c 100644
--- a/src/Avalonia.Themes.Semi/Themes/DarkTheme.axaml
+++ b/src/Semi.Avalonia/Themes/DarkTheme.axaml
@@ -2,8 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- Add Resources Here -->
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Dark/Dark.axaml"/>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Base.axaml"/>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Controls/Controls.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Dark.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Controls.axaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Semi/Themes/Light/Button.axaml b/src/Semi.Avalonia/Themes/Light/Button.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Themes/Light/Button.axaml
rename to src/Semi.Avalonia/Themes/Light/Button.axaml
diff --git a/src/Semi.Avalonia/Themes/Light/Light.axaml b/src/Semi.Avalonia/Themes/Light/Light.axaml
new file mode 100644
index 0000000..58f3952
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Light/Light.axaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Palette.axaml"/>
+        <!-- Controls -->
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Button.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Window.axaml"/>
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Semi/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Themes/Light/Palette.axaml
rename to src/Semi.Avalonia/Themes/Light/Palette.axaml
diff --git a/src/Avalonia.Themes.Semi/Themes/Light/Window.axaml b/src/Semi.Avalonia/Themes/Light/Window.axaml
similarity index 100%
rename from src/Avalonia.Themes.Semi/Themes/Light/Window.axaml
rename to src/Semi.Avalonia/Themes/Light/Window.axaml
diff --git a/src/Avalonia.Themes.Semi/Themes/LightTheme.axaml b/src/Semi.Avalonia/Themes/LightTheme.axaml
similarity index 51%
rename from src/Avalonia.Themes.Semi/Themes/LightTheme.axaml
rename to src/Semi.Avalonia/Themes/LightTheme.axaml
index 84f0136..b9f5b41 100644
--- a/src/Avalonia.Themes.Semi/Themes/LightTheme.axaml
+++ b/src/Semi.Avalonia/Themes/LightTheme.axaml
@@ -3,8 +3,8 @@
     <!-- Add Resources Here -->
     
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Light/Light.axaml"/>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Themes/Base.axaml"/>
-        <ResourceInclude Source="avares://Avalonia.Themes.Semi/Controls/Controls.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Light.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml"/>
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Controls.axaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>