diff --git a/Test.sln b/Test.sln
index b281d09c8..9d061c7b5 100644
--- a/Test.sln
+++ b/Test.sln
@@ -150,7 +150,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Kernel.Tests.Fat2",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleTest", "Tests\Kernels\ConsoleTest\ConsoleTest.csproj", "{0DF97CAC-220B-4DAD-B397-42E394255763}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.UI.Avalonia", "Tests\Cosmos.TestRunner.UI.Avalonia\Cosmos.TestRunner.UI.Avalonia.csproj", "{2992AA07-E126-4EE0-B31C-D0B2ADE3393A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.TestRunner.UI", "Tests\Cosmos.TestRunner.UI\Cosmos.TestRunner.UI.csproj", "{2992AA07-E126-4EE0-B31C-D0B2ADE3393A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.HyperVServer", "source\Cosmos.Debug.HyperVServer\Cosmos.Debug.HyperVServer.csproj", "{3421E19D-16C7-4593-9F6B-291ECB86A3EB}"
 EndProject
diff --git a/Tests/Cosmos.TestRunner.UI.Avalonia/App.xaml b/Tests/Cosmos.TestRunner.UI/App.xaml
similarity index 100%
rename from Tests/Cosmos.TestRunner.UI.Avalonia/App.xaml
rename to Tests/Cosmos.TestRunner.UI/App.xaml
diff --git a/Tests/Cosmos.TestRunner.UI.Avalonia/App.xaml.cs b/Tests/Cosmos.TestRunner.UI/App.xaml.cs
similarity index 100%
rename from Tests/Cosmos.TestRunner.UI.Avalonia/App.xaml.cs
rename to Tests/Cosmos.TestRunner.UI/App.xaml.cs
diff --git a/Tests/Cosmos.TestRunner.UI.Avalonia/Cosmos.TestRunner.UI.Avalonia.csproj b/Tests/Cosmos.TestRunner.UI/Cosmos.TestRunner.UI.csproj
similarity index 85%
rename from Tests/Cosmos.TestRunner.UI.Avalonia/Cosmos.TestRunner.UI.Avalonia.csproj
rename to Tests/Cosmos.TestRunner.UI/Cosmos.TestRunner.UI.csproj
index 9d23e3c30..b4c50744b 100644
--- a/Tests/Cosmos.TestRunner.UI.Avalonia/Cosmos.TestRunner.UI.Avalonia.csproj
+++ b/Tests/Cosmos.TestRunner.UI/Cosmos.TestRunner.UI.csproj
@@ -4,8 +4,7 @@
         <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
         <OutputType>Exe</OutputType>
         <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
-        <AssemblyName>Cosmos.TestRunner.UI</AssemblyName>
-        <RootNamespace>Cosmos.TestRunner.UI</RootNamespace>
+        <SignAssembly>False</SignAssembly>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Tests/Cosmos.TestRunner.UI.Avalonia/ViewModels/MainWindowViewModel.cs b/Tests/Cosmos.TestRunner.UI/ViewModels/MainWindowViewModel.cs
similarity index 100%
rename from Tests/Cosmos.TestRunner.UI.Avalonia/ViewModels/MainWindowViewModel.cs
rename to Tests/Cosmos.TestRunner.UI/ViewModels/MainWindowViewModel.cs
diff --git a/Tests/Cosmos.TestRunner.UI.Avalonia/ViewModels/SettingsDialogViewModel.cs b/Tests/Cosmos.TestRunner.UI/ViewModels/SettingsDialogViewModel.cs
similarity index 100%
rename from Tests/Cosmos.TestRunner.UI.Avalonia/ViewModels/SettingsDialogViewModel.cs
rename to Tests/Cosmos.TestRunner.UI/ViewModels/SettingsDialogViewModel.cs
diff --git a/Tests/Cosmos.TestRunner.UI.Avalonia/Views/MainWindow.xaml b/Tests/Cosmos.TestRunner.UI/Views/MainWindow.xaml
similarity index 100%
rename from Tests/Cosmos.TestRunner.UI.Avalonia/Views/MainWindow.xaml
rename to Tests/Cosmos.TestRunner.UI/Views/MainWindow.xaml
diff --git a/Tests/Cosmos.TestRunner.UI.Avalonia/Views/MainWindow.xaml.cs b/Tests/Cosmos.TestRunner.UI/Views/MainWindow.xaml.cs
similarity index 100%
rename from Tests/Cosmos.TestRunner.UI.Avalonia/Views/MainWindow.xaml.cs
rename to Tests/Cosmos.TestRunner.UI/Views/MainWindow.xaml.cs
diff --git a/Tests/Cosmos.TestRunner.UI.Avalonia/Views/SettingsDialog.xaml b/Tests/Cosmos.TestRunner.UI/Views/SettingsDialog.xaml
similarity index 100%
rename from Tests/Cosmos.TestRunner.UI.Avalonia/Views/SettingsDialog.xaml
rename to Tests/Cosmos.TestRunner.UI/Views/SettingsDialog.xaml
diff --git a/Tests/Cosmos.TestRunner.UI.Avalonia/Views/SettingsDialog.xaml.cs b/Tests/Cosmos.TestRunner.UI/Views/SettingsDialog.xaml.cs
similarity index 100%
rename from Tests/Cosmos.TestRunner.UI.Avalonia/Views/SettingsDialog.xaml.cs
rename to Tests/Cosmos.TestRunner.UI/Views/SettingsDialog.xaml.cs