diff --git a/src/RolandK.AvaloniaExtensions.sln b/RolandK.AvaloniaExtensions.sln
similarity index 72%
rename from src/RolandK.AvaloniaExtensions.sln
rename to RolandK.AvaloniaExtensions.sln
index c01a80a..1730858 100644
--- a/src/RolandK.AvaloniaExtensions.sln
+++ b/RolandK.AvaloniaExtensions.sln
@@ -1,18 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.TestApp", "RolandK.AvaloniaExtensions.TestApp\RolandK.AvaloniaExtensions.TestApp.csproj", "{AF09D6F7-A9B7-4FBD-A1B2-ACE25418E813}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.TestApp", "src\RolandK.AvaloniaExtensions.TestApp\RolandK.AvaloniaExtensions.TestApp.csproj", "{AF09D6F7-A9B7-4FBD-A1B2-ACE25418E813}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions", "RolandK.AvaloniaExtensions\RolandK.AvaloniaExtensions.csproj", "{779B4BE6-6030-4B49-87D4-9162F9E50FCA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions", "src\RolandK.AvaloniaExtensions\RolandK.AvaloniaExtensions.csproj", "{779B4BE6-6030-4B49-87D4-9162F9E50FCA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.DependencyInjection", "RolandK.AvaloniaExtensions.DependencyInjection\RolandK.AvaloniaExtensions.DependencyInjection.csproj", "{4D4CA940-68F9-4EE2-9030-921C0A1B163E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.DependencyInjection", "src\RolandK.AvaloniaExtensions.DependencyInjection\RolandK.AvaloniaExtensions.DependencyInjection.csproj", "{4D4CA940-68F9-4EE2-9030-921C0A1B163E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.Tests", "RolandK.AvaloniaExtensions.Tests\RolandK.AvaloniaExtensions.Tests.csproj", "{270741C0-1A15-4C44-8A1C-0DD86DD8DF23}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.Tests", "src\RolandK.AvaloniaExtensions.Tests\RolandK.AvaloniaExtensions.Tests.csproj", "{270741C0-1A15-4C44-8A1C-0DD86DD8DF23}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.FluentThemeDetection", "RolandK.AvaloniaExtensions.FluentThemeDetection\RolandK.AvaloniaExtensions.FluentThemeDetection.csproj", "{F78873DB-5864-4C50-93A2-C6371D0D26EF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.FluentThemeDetection", "src\RolandK.AvaloniaExtensions.FluentThemeDetection\RolandK.AvaloniaExtensions.FluentThemeDetection.csproj", "{F78873DB-5864-4C50-93A2-C6371D0D26EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.DependencyInjection.Tests", "RolandK.AvaloniaExtensions.DependencyInjection.Tests\RolandK.AvaloniaExtensions.DependencyInjection.Tests.csproj", "{03D69FBA-0153-4CF3-AC81-07E8CC0BB526}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.DependencyInjection.Tests", "src\RolandK.AvaloniaExtensions.DependencyInjection.Tests\RolandK.AvaloniaExtensions.DependencyInjection.Tests.csproj", "{03D69FBA-0153-4CF3-AC81-07E8CC0BB526}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.FluentThemeDetection.Tests", "RolandK.AvaloniaExtensions.FluentThemeDetection.Tests\RolandK.AvaloniaExtensions.FluentThemeDetection.Tests.csproj", "{22806B2B-89D8-4B3F-886E-2B54D734E9BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RolandK.AvaloniaExtensions.FluentThemeDetection.Tests", "src\RolandK.AvaloniaExtensions.FluentThemeDetection.Tests\RolandK.AvaloniaExtensions.FluentThemeDetection.Tests.csproj", "{22806B2B-89D8-4B3F-886E-2B54D734E9BD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/RolandK.AvaloniaExtensions.sln.DotSettings b/RolandK.AvaloniaExtensions.sln.DotSettings
similarity index 100%
rename from src/RolandK.AvaloniaExtensions.sln.DotSettings
rename to RolandK.AvaloniaExtensions.sln.DotSettings
diff --git a/scripts/BuildAndTest.ps1 b/scripts/BuildAndTest.ps1
index 6a3e2bc..b08ee63 100644
--- a/scripts/BuildAndTest.ps1
+++ b/scripts/BuildAndTest.ps1
@@ -1,2 +1,2 @@
-dotnet build -c Release "../src/RolandK.AvaloniaExtensions.sln"
-dotnet test -c Release "../src/RolandK.AvaloniaExtensions.sln"
\ No newline at end of file
+dotnet build -c Release "../RolandK.AvaloniaExtensions.sln"
+dotnet test -c Release "../RolandK.AvaloniaExtensions.sln"
\ No newline at end of file
diff --git a/scripts/Cleanup.ps1 b/scripts/Cleanup.ps1
index 8af6ea3..ad582d4 100644
--- a/scripts/Cleanup.ps1
+++ b/scripts/Cleanup.ps1
@@ -1,5 +1,5 @@
 # Cleanup solution
-dotnet clean "../src/RolandK.AvaloniaExtensions.sln"
+dotnet clean "../RolandK.AvaloniaExtensions.sln"
 
 # Delete all bin and obj directories
 $directories = Get-ChildItem "../src/" -include bin,obj -Recurse
diff --git a/scripts/Pack.ps1 b/scripts/Pack.ps1
index 5b5e633..0f71c5b 100644
--- a/scripts/Pack.ps1
+++ b/scripts/Pack.ps1
@@ -6,4 +6,4 @@ if (Test-Path "../publish")
 }
 
 # Build nuget packages
-dotnet pack -c Release -o ../publish "../src/RolandK.AvaloniaExtensions.sln"  /p:ContinuousIntegrationBuild=true /p:IncludeSymbols=true /p:EmbedUntrackedSources=true -p:SymbolPackageFormat=snupkg
\ No newline at end of file
+dotnet pack -c Release -o ../publish "../RolandK.AvaloniaExtensions.sln"  /p:ContinuousIntegrationBuild=true /p:IncludeSymbols=true /p:EmbedUntrackedSources=true -p:SymbolPackageFormat=snupkg
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 1997184..789236f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -28,7 +28,7 @@
         <PackageIcon>Logo_128.png</PackageIcon>
     </PropertyGroup>
     <ItemGroup>
-        <None Include="$(SolutionDir)../assets/Logo_128.png" Pack="true" PackagePath="\" />
+        <None Include="$(SolutionDir)assets/Logo_128.png" Pack="true" PackagePath="\" />
     </ItemGroup>
 
     <!-- Package license -->