diff --git a/CredentialManager.sln b/CredentialManager.sln
deleted file mode 100644
index 2044b53..0000000
--- a/CredentialManager.sln
+++ /dev/null
@@ -1,43 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32421.90
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CredentialManager", "src\CredentialManager\CredentialManager.csproj", "{141A5D74-1821-41CB-831A-0CDCD469E4AE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Analyzers", "src\Analyzers\Analyzers.csproj", "{47DE5EE9-22A7-4D23-A50E-0724A900D290}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{D0CE060F-5C92-494F-A4D4-441F7CDB1340}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "src\Tests\Tests.csproj", "{160A2CD4-2C93-4C6E-BD87-5F462A932C58}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{141A5D74-1821-41CB-831A-0CDCD469E4AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{141A5D74-1821-41CB-831A-0CDCD469E4AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{141A5D74-1821-41CB-831A-0CDCD469E4AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{141A5D74-1821-41CB-831A-0CDCD469E4AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47DE5EE9-22A7-4D23-A50E-0724A900D290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47DE5EE9-22A7-4D23-A50E-0724A900D290}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47DE5EE9-22A7-4D23-A50E-0724A900D290}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47DE5EE9-22A7-4D23-A50E-0724A900D290}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0CE060F-5C92-494F-A4D4-441F7CDB1340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0CE060F-5C92-494F-A4D4-441F7CDB1340}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0CE060F-5C92-494F-A4D4-441F7CDB1340}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0CE060F-5C92-494F-A4D4-441F7CDB1340}.Release|Any CPU.Build.0 = Release|Any CPU
-		{160A2CD4-2C93-4C6E-BD87-5F462A932C58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{160A2CD4-2C93-4C6E-BD87-5F462A932C58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{160A2CD4-2C93-4C6E-BD87-5F462A932C58}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{160A2CD4-2C93-4C6E-BD87-5F462A932C58}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9553CCFA-953D-400C-BE44-25CA2B8E0F31}
-	EndGlobalSection
-EndGlobal
diff --git a/CredentialManager.slnx b/CredentialManager.slnx
new file mode 100644
index 0000000..e6ce672
--- /dev/null
+++ b/CredentialManager.slnx
@@ -0,0 +1,5 @@
+<Solution>
+  <Project Path="src/Core/Core.csproj" />
+  <Project Path="src/CredentialManager/CredentialManager.csproj" />
+  <Project Path="src/Tests/Tests.csproj" />
+</Solution>
diff --git a/src/Analyzers/Analyzers.csproj b/src/Analyzers/Analyzers.csproj
deleted file mode 100644
index 8ccd675..0000000
--- a/src/Analyzers/Analyzers.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <RootNamespace>Devlooped.CredentialManager</RootNamespace>
-    <AssemblyName>Devlooped.CredentialManager.Analyzers</AssemblyName>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackFolder>analyzers/dotnet</PackFolder>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NuGetizer" Version="1.2.3" PrivateAssets="all" />
-    <PackageReference Include="ThisAssembly.AssemblyInfo" Version="2.1.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" Pack="false" />
-    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Devlooped.CredentialManager.targets" PackagePath="build/Devlooped.CredentialManager.targets" />
-  </ItemGroup>
-
-
-
-</Project>
diff --git a/src/Analyzers/Devlooped.CredentialManager.targets b/src/Analyzers/Devlooped.CredentialManager.targets
deleted file mode 100644
index d483acb..0000000
--- a/src/Analyzers/Devlooped.CredentialManager.targets
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
diff --git a/src/CredentialManager/CredentialManager.csproj b/src/CredentialManager/CredentialManager.csproj
index 16798f7..051b21a 100644
--- a/src/CredentialManager/CredentialManager.csproj
+++ b/src/CredentialManager/CredentialManager.csproj
@@ -26,7 +26,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Analyzers\Analyzers.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\Core\Core.csproj" Pack="false" />
   </ItemGroup>