diff --git a/VisualStudioCppExtensions.sln b/GenerateCppFiltersExtension.sln
similarity index 66%
rename from VisualStudioCppExtensions.sln
rename to GenerateCppFiltersExtension.sln
index 5407eb8..edd3c0d 100644
--- a/VisualStudioCppExtensions.sln
+++ b/GenerateCppFiltersExtension.sln
@@ -3,7 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateFilter", "GenerateFilter\GenerateFilter.csproj", "{18555A86-3A5F-4D33-8C12-01E288BDC30E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateCppFiltersExtension", "GenerateCppFiltersExtension\GenerateCppFiltersExtension.csproj", "{18555A86-3A5F-4D33-8C12-01E288BDC30E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6B724A13-034C-4ABA-884B-15B550A8274F}"
+	ProjectSection(SolutionItems) = preProject
+		appveyor.yml = appveyor.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/GenerateFilter/GenerateFilter.cs b/GenerateCppFiltersExtension/GenerateCppFilters.cs
similarity index 97%
rename from GenerateFilter/GenerateFilter.cs
rename to GenerateCppFiltersExtension/GenerateCppFilters.cs
index 6c20469..38e0047 100644
--- a/GenerateFilter/GenerateFilter.cs
+++ b/GenerateCppFiltersExtension/GenerateCppFilters.cs
@@ -1,5 +1,5 @@
 //------------------------------------------------------------------------------
-// <copyright file="GenerateFilter.cs" company="Company">
+// <copyright file="GenerateCppFilters.cs" company="Company">
 //     Copyright (c) Company.  All rights reserved.
 // </copyright>
 //------------------------------------------------------------------------------
@@ -16,9 +16,9 @@
 using System.Reflection;
 using System.Text;
 
-namespace VisualStudioCppExtensions
+namespace GenerateCppFiltersExtension
 {
-    internal sealed class GenerateFilter
+    internal sealed class GenerateCppFilters
     {
         #region ATTRIBUTES
         public const int CommandId = 0x0100;
@@ -41,11 +41,11 @@ void    OnBeforeQueryStatus(object sender, EventArgs e)
         }
         #endregion
         /// <summary>
-        /// Initializes a new instance of the <see cref="GenerateFilter"/> class.
+        /// Initializes a new instance of the <see cref="GenerateCppFilters"/> class.
         /// Adds our command handlers for menu (commands must exist in the command table file)
         /// </summary>
         /// <param name="package">Owner package, not null.</param>
-        private GenerateFilter(Package package)
+        private GenerateCppFilters(Package package)
         {
             if (package == null)
             {
@@ -68,7 +68,7 @@ private GenerateFilter(Package package)
         /// <summary>
         /// Gets the instance of the command.
         /// </summary>
-        public static GenerateFilter Instance
+        public static GenerateCppFilters Instance
         {
             get;
             private set;
@@ -91,7 +91,7 @@ private IServiceProvider ServiceProvider
         /// <param name="package">Owner package, not null.</param>
         public static void Initialize(Package package)
         {
-            Instance = new GenerateFilter(package);
+            Instance = new GenerateCppFilters(package);
         }
 
         #region PROJECT UTILS
@@ -158,7 +158,7 @@ static private void SetAdditionalIncludeDirectories(Project project, Dictionary<
                 includePaths.Add(GetRelativePathIfNeeded(projectPath, Path.GetDirectoryName(file)));
             }
 
-            string filterAssemblyInstallionPath = Path.GetDirectoryName(GetAssemblyLocalPathFrom(typeof(GenerateFilterPackage)));
+            string filterAssemblyInstallionPath = Path.GetDirectoryName(GetAssemblyLocalPathFrom(typeof(GenerateCppFiltersPackage)));
 
             DTE dte = (DTE)Package.GetGlobalService(typeof(DTE));
             if (dte.Version.StartsWith("14"))
diff --git a/GenerateFilter/GenerateFilter.csproj b/GenerateCppFiltersExtension/GenerateCppFiltersExtension.csproj
similarity index 91%
rename from GenerateFilter/GenerateFilter.csproj
rename to GenerateCppFiltersExtension/GenerateCppFiltersExtension.csproj
index 7975989..ebdb610 100644
--- a/GenerateFilter/GenerateFilter.csproj
+++ b/GenerateCppFiltersExtension/GenerateCppFiltersExtension.csproj
@@ -12,6 +12,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>15.0</OldToolsVersion>
+    <DeployExtension Condition="'$(AppVeyor)' != ''">False</DeployExtension>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -20,7 +21,7 @@
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Resources\GenerateFilter.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\GenerateCppFilters.ico</ApplicationIcon>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -31,8 +32,8 @@
     <ProjectGuid>{18555A86-3A5F-4D33-8C12-01E288BDC30E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>VisualStudioCppExtensions</RootNamespace>
-    <AssemblyName>VisualStudioCppExtensions</AssemblyName>
+    <RootNamespace>GenerateCppFiltersExtension</RootNamespace>
+    <AssemblyName>GenerateCppFiltersExtension</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@@ -59,32 +60,29 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="GenerateFilter.cs" />
-    <Compile Include="GenerateFilterPackage.cs" />
+    <Compile Include="GenerateCppFilters.cs" />
+    <Compile Include="GenerateCppFiltersPackage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Key.snk" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
     <Content Include="Resources\LICENSE">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <VSCTCompile Include="GenerateFilterPackage.vsct">
+    <VSCTCompile Include="GenerateCppFiltersPackage.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
       <SubType>Designer</SubType>
     </VSCTCompile>
-    <Content Include="index.html" />
-    <Content Include="Resources\GenerateFilterPackage.ico">
+    <Content Include="Resources\GenerateCppFiltersPackage.ico">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Resources\GenerateFilter.ico">
+    <Content Include="Resources\GenerateCppFilters.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -97,7 +95,6 @@
     <Content Include="Resources\PreviewImage.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="stylesheet.css" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -120,75 +117,60 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
-      <Private>True</Private>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
-      <Private>True</Private>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
-      <Private>True</Private>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Threading.14.1.111\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
diff --git a/GenerateFilter/GenerateFilterPackage.cs b/GenerateCppFiltersExtension/GenerateCppFiltersPackage.cs
similarity index 88%
rename from GenerateFilter/GenerateFilterPackage.cs
rename to GenerateCppFiltersExtension/GenerateCppFiltersPackage.cs
index c9fc40c..0721e70 100644
--- a/GenerateFilter/GenerateFilterPackage.cs
+++ b/GenerateCppFiltersExtension/GenerateCppFiltersPackage.cs
@@ -1,5 +1,5 @@
 //------------------------------------------------------------------------------
-// <copyright file="GenerateFilterPackage.cs" company="Company">
+// <copyright file="GenerateCppFiltersPackage.cs" company="Company">
 //     Copyright (c) Company.  All rights reserved.
 // </copyright>
 //------------------------------------------------------------------------------
@@ -16,7 +16,7 @@
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.Win32;
 
-namespace VisualStudioCppExtensions
+namespace GenerateCppFiltersExtension
 {
     /// <summary>
     /// This is the class that implements the package exposed by this assembly.
@@ -38,20 +38,20 @@ namespace VisualStudioCppExtensions
     [PackageRegistration(UseManagedResourcesOnly = true)]
     [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] // Info on this package for Help/About
     [ProvideMenuResource("Menus.ctmenu", 1)]
-    [Guid(GenerateFilterPackage.PackageGuidString)]
+    [Guid(GenerateCppFiltersPackage.PackageGuidString)]
     [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")]
     [ProvideAutoLoad(UIContextGuids.SolutionExists)]
-    public sealed class GenerateFilterPackage : Package
+    public sealed class GenerateCppFiltersPackage : Package
     {
         /// <summary>
-        /// GenerateFilterPackage GUID string.
+        /// GenerateCppFiltersPackage GUID string.
         /// </summary>
         public const string PackageGuidString = "99d03761-6200-41ad-b2a1-638ae9e780e5";
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="GenerateFilter"/> class.
+        /// Initializes a new instance of the <see cref="GenerateCppFilters"/> class.
         /// </summary>
-        public GenerateFilterPackage()
+        public GenerateCppFiltersPackage()
         {
             // Inside this method you can place any initialization code that does not require
             // any Visual Studio service because at this point the package object is created but
@@ -67,7 +67,7 @@ public GenerateFilterPackage()
         /// </summary>
         protected override void Initialize()
         {
-            GenerateFilter.Initialize(this);
+            GenerateCppFilters.Initialize(this);
             base.Initialize();
         }
 
diff --git a/GenerateFilter/GenerateFilterPackage.vsct b/GenerateCppFiltersExtension/GenerateCppFiltersPackage.vsct
similarity index 53%
rename from GenerateFilter/GenerateFilterPackage.vsct
rename to GenerateCppFiltersExtension/GenerateCppFiltersPackage.vsct
index fa15656..14b99ca 100644
--- a/GenerateFilter/GenerateFilterPackage.vsct
+++ b/GenerateCppFiltersExtension/GenerateCppFiltersPackage.vsct
@@ -3,9 +3,9 @@
   <Extern href="stdidcmd.h"/>
   <Extern href="vsshlids.h"/>
 
-  <Commands package="guidGenerateFilterPackage">
+  <Commands package="guidGenerateCppFiltersPackage">
     <Groups>
-      <Group guid="guidGenerateFilterPackageCmdSet" id="grpIdProjectContextAdd" priority="0x0102">
+      <Group guid="guidGenerateCppFiltersPackageCmdSet" id="grpIdProjectContextAdd" priority="0x0102">
         <!-- Can check what the other existing id/priority (for positioning) are by looking at SharedCmdPlace.vsct, need to modify the group priority while targetting the right id -->
         <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_PROJNODE" />
 
@@ -15,9 +15,9 @@
     </Groups>
 
     <Buttons>
-      <Button guid="guidGenerateFilterPackageCmdSet" id="GenerateFilterCommand" type="Button" priority="0x0100">
-        <Parent guid="guidGenerateFilterPackageCmdSet" id="grpIdProjectContextAdd" />
-        <Icon guid="GenerateFilterIcon" id="GenerateFilterIconID" />
+      <Button guid="guidGenerateCppFiltersPackageCmdSet" id="GenerateCppFiltersCommand" type="Button" priority="0x0100">
+        <Parent guid="guidGenerateCppFiltersPackageCmdSet" id="grpIdProjectContextAdd" />
+        <Icon guid="GenerateCppFiltersIcon" id="GenerateCppFiltersIconID" />
         
         <CommandFlag>DefaultInvisible</CommandFlag>
         <CommandFlag>DynamicVisibility</CommandFlag>
@@ -29,21 +29,21 @@
     </Buttons>
 
     <Bitmaps>
-      <Bitmap guid="GenerateFilterIcon" href="Resources\GenerateFilter.ico" usedList="GenerateFilterIconID"/>
+      <Bitmap guid="GenerateCppFiltersIcon" href="Resources\GenerateCppFilters.ico" usedList="GenerateCppFiltersIconID"/>
     </Bitmaps>
   </Commands>
 
   <Symbols>
-    <GuidSymbol name="guidGenerateFilterPackage" value="{99d03761-6200-41ad-b2a1-638ae9e780e5}" />
+    <GuidSymbol name="guidGenerateCppFiltersPackage" value="{99d03761-6200-41ad-b2a1-638ae9e780e5}" />
 
-    <GuidSymbol name="guidGenerateFilterPackageCmdSet" value="{acd8036f-19ae-43b2-a2d6-11788cb282fe}">
-      <IDSymbol name="GenerateFilterCommand" value="0x0100" />
+    <GuidSymbol name="guidGenerateCppFiltersPackageCmdSet" value="{acd8036f-19ae-43b2-a2d6-11788cb282fe}">
+      <IDSymbol name="GenerateCppFiltersCommand" value="0x0100" />
       <IDSymbol name="grpIdProjectContextAdd" value="0x1080" />
       <IDSymbol name="grpIdSolutionContextAdd" value="0x1081" />
     </GuidSymbol>
 
-    <GuidSymbol name="GenerateFilterIcon" value="{363F9640-FBB7-4403-AB20-9A53EA067ECA}">
-      <IDSymbol name="GenerateFilterIconID" value="1" />
+    <GuidSymbol name="GenerateCppFiltersIcon" value="{363F9640-FBB7-4403-AB20-9A53EA067ECA}">
+      <IDSymbol name="GenerateCppFiltersIconID" value="1" />
     </GuidSymbol>
   </Symbols>
 </CommandTable>
diff --git a/GenerateFilter/Key.snk b/GenerateCppFiltersExtension/Key.snk
similarity index 100%
rename from GenerateFilter/Key.snk
rename to GenerateCppFiltersExtension/Key.snk
diff --git a/GenerateFilter/Properties/AssemblyInfo.cs b/GenerateCppFiltersExtension/Properties/AssemblyInfo.cs
similarity index 90%
rename from GenerateFilter/Properties/AssemblyInfo.cs
rename to GenerateCppFiltersExtension/Properties/AssemblyInfo.cs
index ece20f6..73528cd 100644
--- a/GenerateFilter/Properties/AssemblyInfo.cs
+++ b/GenerateCppFiltersExtension/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("VisualStudioCppExtensions")]
+[assembly: AssemblyTitle("GenerateCppFiltersExtension")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("VisualStudioCppExtensions")]
+[assembly: AssemblyProduct("GenerateCppFiltersExtension")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/GenerateFilter/Resources/GenerateFilter.ico b/GenerateCppFiltersExtension/Resources/GenerateCppFilters.ico
similarity index 100%
rename from GenerateFilter/Resources/GenerateFilter.ico
rename to GenerateCppFiltersExtension/Resources/GenerateCppFilters.ico
diff --git a/GenerateFilter/Resources/GenerateFilterPackage.ico b/GenerateCppFiltersExtension/Resources/GenerateCppFiltersPackage.ico
similarity index 100%
rename from GenerateFilter/Resources/GenerateFilterPackage.ico
rename to GenerateCppFiltersExtension/Resources/GenerateCppFiltersPackage.ico
diff --git a/GenerateFilter/Resources/LICENSE b/GenerateCppFiltersExtension/Resources/LICENSE
similarity index 100%
rename from GenerateFilter/Resources/LICENSE
rename to GenerateCppFiltersExtension/Resources/LICENSE
diff --git a/GenerateFilter/Resources/PreviewImage.png b/GenerateCppFiltersExtension/Resources/PreviewImage.png
similarity index 100%
rename from GenerateFilter/Resources/PreviewImage.png
rename to GenerateCppFiltersExtension/Resources/PreviewImage.png
diff --git a/GenerateFilter/Resources/VCProjectEngine_14.0.dll b/GenerateCppFiltersExtension/Resources/VCProjectEngine_14.0.dll
similarity index 100%
rename from GenerateFilter/Resources/VCProjectEngine_14.0.dll
rename to GenerateCppFiltersExtension/Resources/VCProjectEngine_14.0.dll
diff --git a/GenerateFilter/Resources/VCProjectEngine_15.0.dll b/GenerateCppFiltersExtension/Resources/VCProjectEngine_15.0.dll
similarity index 100%
rename from GenerateFilter/Resources/VCProjectEngine_15.0.dll
rename to GenerateCppFiltersExtension/Resources/VCProjectEngine_15.0.dll
diff --git a/GenerateFilter/VSPackage.resx b/GenerateCppFiltersExtension/VSPackage.resx
similarity index 95%
rename from GenerateFilter/VSPackage.resx
rename to GenerateCppFiltersExtension/VSPackage.resx
index 654fdbb..a7ab075 100644
--- a/GenerateFilter/VSPackage.resx
+++ b/GenerateCppFiltersExtension/VSPackage.resx
@@ -118,13 +118,13 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="110" xml:space="preserve">
-    <value>GenerateFilter Extension</value>
+    <value>GenerateCppFilters Extension</value>
   </data>
   <data name="112" xml:space="preserve">
-    <value>GenerateFilter Visual Studio Extension Detailed Info</value>
+    <value>GenerateCppFilters Visual Studio Extension Detailed Info</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\GenerateFilterPackage.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Resources\GenerateCppFiltersPackage.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/GenerateFilter/packages.config b/GenerateCppFiltersExtension/packages.config
similarity index 64%
rename from GenerateFilter/packages.config
rename to GenerateCppFiltersExtension/packages.config
index c1b5fc3..102aa50 100644
--- a/GenerateFilter/packages.config
+++ b/GenerateCppFiltersExtension/packages.config
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="12.0.21003" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.3.25407" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61030" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30110" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net452" />
-  <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" />
+  <package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="12.0.21003" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.3.25407" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61030" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30110" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net46" />
   <package id="Microsoft.VSSDK.BuildTools" version="15.5.72" targetFramework="net46" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/GenerateFilter/source.extension.vsixmanifest b/GenerateCppFiltersExtension/source.extension.vsixmanifest
similarity index 84%
rename from GenerateFilter/source.extension.vsixmanifest
rename to GenerateCppFiltersExtension/source.extension.vsixmanifest
index 28b2bc5..b7167e5 100644
--- a/GenerateFilter/source.extension.vsixmanifest
+++ b/GenerateCppFiltersExtension/source.extension.vsixmanifest
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2d" Version="1.3" Language="en-US" Publisher="Stephane Molina" />
+    <Identity Id="GenerateCppFiltersExtension.Company.5fdbeaec-89c7-4773-997c-f46757c67a2d" Version="1.3" Language="en-US" Publisher="Stephane Molina" />
     <DisplayName>Generate C++ Filters</DisplayName>
     <Description xml:space="preserve">Simple Extension which provide the ability to generate C++ project filters to replicate the folder hierarchy of underlying sources</Description>
     <License>Resources\LICENSE</License>
-    <Icon>Resources\GenerateFilter.ico</Icon>
+    <Icon>Resources\GenerateCppFilters.ico</Icon>
     <PreviewImage>Resources\PreviewImage.png</PreviewImage>
     <Tags>c++;folder;import;filter</Tags>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,15.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,)" />
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
diff --git a/GenerateFilter/index.html b/GenerateFilter/index.html
deleted file mode 100644
index 947b054..0000000
--- a/GenerateFilter/index.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset='utf-8'>
-
-    <link rel="stylesheet" type="text/css" href="stylesheet.css" media="screen">
-
-    <title>Getting Started</title>
-</head>
-
-<body>
-    <div class="container">
-        <div id="header">
-            <h1>Getting Started</h1>
-            <h2>Visual Studio Extensions</h2>
-        </div>
-
-        <div id="main_content">
-            <div id="lpanel">
-                <h1>Creating a Visual Studio Extension</h1>
-
-                <p>This project enables developers to create an extension for Visual Studio. The solution contains a VSIX project that packages the extension into a VSIX file. This file is used to install an extension for Visual Studio.</p>
-                <h2>Add new features</h2>
-
-                <ol>
-                    <li>Right-click the project node in Solution Explorer and select Add&gt;New Item.</li>
-                    <li>In the Add New Item dialog box, expand the Extensibility node under Visual C# or Visual Basic.</li>
-                    <li>Choose from the available item templates: Visual Studio Package, Editor Items (Classifier, Margin, Text Adornment, Viewport Adornment), Command, Tool Window, Toolbox Control, and then click Add.</li>
-                </ol>
-
-                <p>The files for the template that you selected are added to the project. You can start adding functionality to your item template, press F5 to run the project, or add additional item templates.</p>
-
-                <h2>Run and debug</h2>
-                <p>To run the project, press F5. Visual Studio will:</p>
-
-                <ul>
-                    <li>Build the extension from the VSIX project.</li>
-                    <li>Create a VSIX package from the VSIX project.</li>
-                    <li>When debugging, start an experimental instance of Visual Studio with the VSIX package installed.</li>
-                </ul>
-
-                <p>In the experimental instance of Visual Studio you can test out the functionality of your extension without affecting your Visual Studio installation.</p>
-
-            </div>
-            <div id="rpanel">
-                <div>
-                    <h1>Visual Studio Extensibility Resources</h1>
-
-                    <ol>
-                        <li><a target="_blank" href="http://aka.ms/d0ru3v">MSDN documentation</a><br />Detailed documentation and API reference material for building extensions.</li>
-                        <li><a target="_blank" href="http://aka.ms/pauhge">Extension samples on GitHub</a><br />Use a sample project to kickstart your development.</li>
-                        <li><a target="_blank" href="http://aka.ms/l24u91">Extensibility chat room on Gitter</a><br />Meet other extension developers and exchange tips and tricks for extension development.</li>
-                        <li><a target="_blank" href="http://aka.ms/fwg1ft">Channel 9 videos on extensibility</a><br />Watch videos from the product team on Visual Studio extensibility.</li>
-                        <li><a target="_blank" href="http://aka.ms/ui0qn6">Extensibility Tools 2015</a><br />Install an optional helper tool that adds extra IDE support for extension authors.</li>
-                    </ol>
-                    <h1>Give us feedback</h1>
-                    <ul>
-                        <li><a target="_blank" href="http://aka.ms/uonulm">Submit a new feature idea or suggestion</a></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
diff --git a/GenerateFilter/stylesheet.css b/GenerateFilter/stylesheet.css
deleted file mode 100644
index d5e9c71..0000000
--- a/GenerateFilter/stylesheet.css
+++ /dev/null
@@ -1,129 +0,0 @@
-body {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  color: #1E1E1E;
-  font-size: 13px;
-  font-family: "Segoe UI", Helvetica, Arial, sans-serif;
-  line-height: 1.45;
-  word-wrap: break-word;
-}
-
-/* General & 'Reset' Stuff */
-
-
-.container {
-  width: 980px;
-  margin: 0 auto;
-}
-
-section {
-  display: block;
-  margin: 0;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  margin: 0;
-}
-
-/* Header, <header>
-   header   - container
-   h1       - project name
-   h2       - project description
-*/
-
-#header {
-  color: #FFF;
-  background: #68217a;
-  position:relative;
-}
-#hangcloud {
-    width: 190px;
-    height: 160px;
-    background: url("../images/bannerart03.png");
-    position: absolute;
-    top: 0;
-    right: -30px;
-}
-h1, h2 {
-  font-family: "Segoe UI Light", "Segoe UI", Helvetica, Arial, sans-serif;
-  line-height: 1;
-  margin: 0 18px;
-  padding: 0;
-}
-#header h1 {
-  font-size: 3.4em;
-  padding-top: 18px;
-  font-weight: normal;
-  margin-left: 15px;
-}
-
-#header h2 {
-  font-size: 1.5em;
-  margin-top: 10px;
-  padding-bottom: 18px;
-  font-weight: normal;
-}
-
-
-#main_content {
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-}
-
-
-h1, h2, h3, h4, h5, h6 {
-  font-weight: bolder;
-}
-
-#main_content h1 {
-  font-size: 1.8em;
-  margin-top: 34px;
-}
-
-    #main_content h1:first-child {
-        margin-top: 30px;
-    }
-
-#main_content h2 {
-  font-size: 1.4em;
-  font-weight: bold;
-}
-p, ul {
-    margin: 11px 18px;
-}
-
-#main_content a {
-    color: #06C;
-    text-decoration: none;
-}
-ul {
-        margin-top: 13px;
-    margin-left: 18px;
-    padding-left: 0;
-}
-    ul li {
-        margin-left: 18px;
-        padding-left: 0;
-    }
-#lpanel {
-    width: 620px;
-    float: left;
-}
-#rpanel ul {
-    list-style-type: none;
-    width: 300px;
-}
-    #rpanel ul li {
-        line-height: 1.8em;
-    }
-#rpanel {
-    background: #e7e7e7;
-    width: 360px;
-        float: right;
-}
-
-#rpanel div {
-  width: 300px;
-}
diff --git a/appveyor.yml b/appveyor.yml
index b066a9f..ae70514 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,24 +1,17 @@
-version: "1.50.{build}"
+version: 1.50.{build}
 
-#vc150
-os: Visual Studio 2017
+image: Visual Studio 2019
+
+before_build:
+- cmd: nuget restore
 
 configuration:
-  - Debug
   - Release
 
-init:
-  - set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%PATH%
-  - cmd: msbuild /version
-
-clone_folder: C:\projects\VisualStudioCppExtensions
-
 build:
-  project: $(APPVEYOR_BUILD_FOLDER)\VisualStudioCppExtensions.sln
-  parallel: true
-  verbosity: normal
+  verbosity: minimal
+
+artifacts:
+- path: '**\*.vsix'
 
-before_build:
-  - nuget restore VisualStudioCppExtensions.sln -Verbosity quiet
 
-test: off