diff --git a/samples/CSharp/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/source.extension.vsixmanifest b/samples/CSharp/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/source.extension.vsixmanifest
index eb16e066..32cc1095 100644
--- a/samples/CSharp/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/source.extension.vsixmanifest
+++ b/samples/CSharp/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/source.extension.vsixmanifest
@@ -12,7 +12,7 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ConvertToAutoProperty.CSharp" Path="|ConvertToAutoProperty.CSharp|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ConvertToAutoProperty.CSharp" Path="..\ConvertToAutoProperty.Implementation\ConvertToAutoProperty.CSharp.csproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
diff --git a/samples/CSharp/ConvertToConditional/ConvertToConditional.Vsix/source.extension.vsixmanifest b/samples/CSharp/ConvertToConditional/ConvertToConditional.Vsix/source.extension.vsixmanifest
index b947dc7a..dba6b2e9 100644
--- a/samples/CSharp/ConvertToConditional/ConvertToConditional.Vsix/source.extension.vsixmanifest
+++ b/samples/CSharp/ConvertToConditional/ConvertToConditional.Vsix/source.extension.vsixmanifest
@@ -12,8 +12,8 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ConvertToConditional.CSharp" Path="|ConvertToConditional.CSharp|"/>
-    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="ConvertToConditional.CSharp" Path="|ConvertToConditional.CSharp|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ConvertToConditional.CSharp" Path="..\ConvertToConditional.Implementation\ConvertToConditional.CSharp.csproj"/>
+    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="ConvertToConditional.CSharp" Path="..\ConvertToConditional.Implementation\ConvertToConditional.CSharp.csproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
diff --git a/samples/CSharp/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/source.extension.vsixmanifest b/samples/CSharp/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/source.extension.vsixmanifest
index 35a1691a..ef7bb269 100644
--- a/samples/CSharp/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/source.extension.vsixmanifest
+++ b/samples/CSharp/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/source.extension.vsixmanifest
@@ -12,7 +12,7 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ImplementNotifyPropertyChanged.CSharp" Path="|ImplementNotifyPropertyChanged.CSharp|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ImplementNotifyPropertyChanged.CSharp" Path="..\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged.CSharp.csproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
diff --git a/samples/CSharp/MakeConst/MakeConst.Vsix/source.extension.vsixmanifest b/samples/CSharp/MakeConst/MakeConst.Vsix/source.extension.vsixmanifest
index 7e977f19..46e05ab9 100644
--- a/samples/CSharp/MakeConst/MakeConst.Vsix/source.extension.vsixmanifest
+++ b/samples/CSharp/MakeConst/MakeConst.Vsix/source.extension.vsixmanifest
@@ -12,8 +12,8 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="MakeConst.CSharp" Path="|MakeConst.CSharp|"/>
-    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="MakeConst.CSharp" Path="|MakeConst.CSharp|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="MakeConst.CSharp" Path="..\MakeConst.Implementation\MakeConst.CSharp.csproj"/>
+    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="MakeConst.CSharp" Path="..\MakeConst.Implementation\MakeConst.CSharp.csproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
diff --git a/samples/CSharp/RefOutModifier/RefOutModifier.Vsix/source.extension.vsixmanifest b/samples/CSharp/RefOutModifier/RefOutModifier.Vsix/source.extension.vsixmanifest
index 2fe08bf2..55f0b8b6 100644
--- a/samples/CSharp/RefOutModifier/RefOutModifier.Vsix/source.extension.vsixmanifest
+++ b/samples/CSharp/RefOutModifier/RefOutModifier.Vsix/source.extension.vsixmanifest
@@ -12,7 +12,7 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="RefOutModifier.CSharp" Path="|RefOutModifier.CSharp|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="RefOutModifier.CSharp" Path="..\RefOutModifier.Implementation\RefOutModifier.CSharp.csproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
diff --git a/samples/VisualBasic/Analyzers/Analyzers.Vsix/source.extension.vsixmanifest b/samples/VisualBasic/Analyzers/Analyzers.Vsix/source.extension.vsixmanifest
index 348b84d1..5f29a4e7 100644
--- a/samples/VisualBasic/Analyzers/Analyzers.Vsix/source.extension.vsixmanifest
+++ b/samples/VisualBasic/Analyzers/Analyzers.Vsix/source.extension.vsixmanifest
@@ -12,8 +12,8 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="Analyzers" Path="|Analyzers|"/>
-    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="Analyzers" Path="|Analyzers|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="Analyzers.VisualBasic" Path="..\Analyzers.Implementation\Analyzers.VisualBasic.vbproj"/>
+    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="Analyzers.VisualBasic" Path="..\Analyzers.Implementation\Analyzers.VisualBasic.vbproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
diff --git a/samples/VisualBasic/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/source.extension.vsixmanifest b/samples/VisualBasic/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/source.extension.vsixmanifest
index 6d40e693..68c4bdf1 100644
--- a/samples/VisualBasic/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/source.extension.vsixmanifest
+++ b/samples/VisualBasic/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/source.extension.vsixmanifest
@@ -12,7 +12,7 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ConvertToAutoProperty.VisualBasic" Path="|ConvertToAutoProperty.VisualBasic|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ConvertToAutoProperty.VisualBasic" Path="..\ConvertToAutoProperty\ConvertToAutoProperty.VisualBasic.vbproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
diff --git a/samples/VisualBasic/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/source.extension.vsixmanifest b/samples/VisualBasic/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/source.extension.vsixmanifest
index a906ba69..0b1dc682 100644
--- a/samples/VisualBasic/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/source.extension.vsixmanifest
+++ b/samples/VisualBasic/ImplementNotifyPropertyChanged/ImplementNotifyPropertyChanged.Vsix/source.extension.vsixmanifest
@@ -12,7 +12,7 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ImplementNotifyPropertyChanged.VisualBasic" Path="|ImplementNotifyPropertyChanged.VisualBasic|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ImplementNotifyPropertyChanged.VisualBasic" Path="..\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged.VisualBasic.vbproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
diff --git a/samples/VisualBasic/MakeConst/MakeConst.Vsix/source.extension.vsixmanifest b/samples/VisualBasic/MakeConst/MakeConst.Vsix/source.extension.vsixmanifest
index 2d847f77..c6208034 100644
--- a/samples/VisualBasic/MakeConst/MakeConst.Vsix/source.extension.vsixmanifest
+++ b/samples/VisualBasic/MakeConst/MakeConst.Vsix/source.extension.vsixmanifest
@@ -12,8 +12,8 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="MakeConst.VisualBasic" Path="|MakeConst.VisualBasic|"/>
-    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="MakeConst.VisualBasic" Path="|MakeConst.VisualBasic|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="MakeConst.VisualBasic" Path="..\MakeConst\MakeConst.VisualBasic.vbproj"/>
+    <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="MakeConst.VisualBasic" Path="..\MakeConst\MakeConst.VisualBasic.vbproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
diff --git a/samples/VisualBasic/RemoveByVal/RemoveByVal.Vsix/source.extension.vsixmanifest b/samples/VisualBasic/RemoveByVal/RemoveByVal.Vsix/source.extension.vsixmanifest
index d5cffbf8..c51a865f 100644
--- a/samples/VisualBasic/RemoveByVal/RemoveByVal.Vsix/source.extension.vsixmanifest
+++ b/samples/VisualBasic/RemoveByVal/RemoveByVal.Vsix/source.extension.vsixmanifest
@@ -12,7 +12,7 @@
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
   </Dependencies>
   <Assets>
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="RemoveByVal.VisualBasic" Path="|RemoveByVal.VisualBasic|"/>
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="RemoveByVal.VisualBasic" Path="..\RemoveByVal\RemoveByVal.VisualBasic.vbproj"/>
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />