diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0670073..19668dd 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,26 +5,25 @@
     <LangVersion>10</LangVersion>
     <RootNamespace>SGF</RootNamespace>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <!--- Paths -->
     <SGFSourceDir>$(MSBuildThisFileDirectory)</SGFSourceDir>
-
+    <!-- Paths | SGF Core -->
     <SGFProjectDir>$(SGFSourceDir)SourceGenerator.Foundations\</SGFProjectDir>
     <SGFProjectPath>$(SGFProjectDir)SourceGenerator.Foundations.csproj</SGFProjectPath>
     <SGFTargetsPath>$(SGFProjectDir)SourceGenerator.Foundations.targets</SGFTargetsPath>
     <SGFPropsPath>$(SGFProjectDir)SourceGenerator.Foundations.props</SGFPropsPath>
-
+    <!-- Paths | SGF Shared -->
     <SGFSharedProjectDir>$(SGFSourceDir)SourceGenerator.Foundations.Shared\</SGFSharedProjectDir>
     <SGFSharedProjectItemsPath>$(SGFSharedProjectDir)SourceGenerator.Foundations.Shared.projitems</SGFSharedProjectItemsPath>
-
+    <!-- Paths | SGF Contracts -->
     <SGFContractsProjectDir>$(SGFSourceDir)SourceGenerator.Foundations.Contracts\</SGFContractsProjectDir>
     <SGFContractsProjectPath>$(SGFContractsProjectDir)SourceGenerator.Foundations.Contracts.csproj</SGFContractsProjectPath>
-
+    <!-- Paths | SGF Injector -->
     <SGFInjectorProjectDir>$(SGFSourceDir)SourceGenerator.Foundations.Injector\</SGFInjectorProjectDir>
     <SGFInjectorProjectPath>$(SGFInjectorProjectDir)SourceGenerator.Foundations.Injector.csproj</SGFInjectorProjectPath>
-
+    <!-- Paths | SGF MSBuild -->
     <SGFMSBuildProjectDir>$(SGFSourceDir)SourceGenerator.Foundations.MSBuild\</SGFMSBuildProjectDir>
     <SGFMSBuildProjectPath>$(SGFMSBuildProjectDir)SourceGenerator.Foundations.MSBuild.csproj</SGFMSBuildProjectPath>
-
+    <!-- Paths | SGF Plugin Window -->
     <SGFWindowsPluginProjectDir>$(SGFSourceDir)Plugins\SourceGenerator.Foundations.Windows\</SGFWindowsPluginProjectDir>
     <SGFWindowsPluginProjectPath>$(SGFWindowsPluginProjectDir)SourceGenerator.Foundations.Windows.csproj</SGFWindowsPluginProjectPath>
   </PropertyGroup>
diff --git a/src/SourceGenerator.Foundations.MSBuild/SourceGenerator.Foundations.MSBuild.targets b/src/SourceGenerator.Foundations.MSBuild/SourceGenerator.Foundations.MSBuild.targets
index c1625e6..749d1c6 100644
--- a/src/SourceGenerator.Foundations.MSBuild/SourceGenerator.Foundations.MSBuild.targets
+++ b/src/SourceGenerator.Foundations.MSBuild/SourceGenerator.Foundations.MSBuild.targets
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <IsNuGetPackage>false</IsNuGetPackage>
     <IsNuGetPackage Condition="Exists('$(MSBuildThisFileDirectory)..\.nupkg.metadata')">true</IsNuGetPackage>
-    <SGFTaskAssemblyPath>$(MSBuildThisFileDirectory)bin/$(Configuration)/netstandard2.0\$(MSBuildThisFileName).dll</SGFTaskAssemblyPath>
+    <SGFTaskAssemblyPath>$(MSBuildThisFileDirectory)bin/$(Configuration)\netstandard2.0\$(MSBuildThisFileName).dll</SGFTaskAssemblyPath>
     <SGFTaskAssemblyPath Condition="Exists('$(MSBuildThisFileName).dll')">$(MSBuildThisFileName).dll</SGFTaskAssemblyPath>
   </PropertyGroup>
   <UsingTask
diff --git a/src/SourceGenerator.Foundations.sln b/src/SourceGenerator.Foundations.sln
index 963ed98..8e46947 100644
--- a/src/SourceGenerator.Foundations.sln
+++ b/src/SourceGenerator.Foundations.sln
@@ -29,8 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp.SourceGenerator"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGenerator.Foundations.Injector", "SourceGenerator.Foundations.Injector\SourceGenerator.Foundations.Injector.csproj", "{E9B785CC-B19E-499F-915D-7E37F727C50C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGenerator.Foundations.MSBuild", "SourceGenerator.Foundations.MSBuild\SourceGenerator.Foundations.MSBuild.csproj", "{539FC8F9-6B2E-4DC3-B5C1-368F8117EFAD}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -87,14 +85,6 @@ Global
 		{E9B785CC-B19E-499F-915D-7E37F727C50C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E9B785CC-B19E-499F-915D-7E37F727C50C}.Release|x64.ActiveCfg = Release|Any CPU
 		{E9B785CC-B19E-499F-915D-7E37F727C50C}.Release|x64.Build.0 = Release|Any CPU
-		{539FC8F9-6B2E-4DC3-B5C1-368F8117EFAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{539FC8F9-6B2E-4DC3-B5C1-368F8117EFAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{539FC8F9-6B2E-4DC3-B5C1-368F8117EFAD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{539FC8F9-6B2E-4DC3-B5C1-368F8117EFAD}.Debug|x64.Build.0 = Debug|Any CPU
-		{539FC8F9-6B2E-4DC3-B5C1-368F8117EFAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{539FC8F9-6B2E-4DC3-B5C1-368F8117EFAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{539FC8F9-6B2E-4DC3-B5C1-368F8117EFAD}.Release|x64.ActiveCfg = Release|Any CPU
-		{539FC8F9-6B2E-4DC3-B5C1-368F8117EFAD}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets
index 396815c..455fccc 100644
--- a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets
+++ b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets
@@ -15,9 +15,6 @@
     <FilterAssembliesTask Assemblies="@(ReferencePath->'%(RootDir)%(Directory)%(Filename)%(Extension)')">
       <Output TaskParameter="FilteredAssemblies" ItemName="SGF_FilteredAssembly"/>
     </FilterAssembliesTask>
-
-    <Message Importance="high" Text="Filtered: @(System.Runtime.InteropServices)"/>
-    
     <!-- Embedded Assemblies -->
     <ItemGroup>
       <!-- Embedded Assemblies -->