diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/NewItems.vsdir b/Nodejs/Product/Nodejs/FileTemplates/NewItem/NewItems.vsdir
deleted file mode 100644
index 7fb8c8333..000000000
--- a/Nodejs/Product/Nodejs/FileTemplates/NewItem/NewItems.vsdir
+++ /dev/null
@@ -1,9 +0,0 @@
-EmptyJs.js|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3007|100|#3011|0|#403|0|#3013
-EmptyTs.ts|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3017|200|#3018|{2ffe45c4-5c73-493c-b187-f2e955ff875e}|#3|0|#3019
-EmptyHtml.html|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3032|400|#3033|0|#415|0|#3034
-EmptyCss.css|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3029|410|#3030|0|#414|0|#3031
-EmptyJson.json|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3023|420|#3024|0|0|0|#3025
-EmptyPug.pug|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3020|430|#3021|0|#417|0|#3022
-EmptyLess.less|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3038|450|#3039|0|0|0|#3040
-EmptyXml.xml|{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}|#3035|490|#3036|0|#416|0|#3037
-TextFile.txt|{DA9FB551-C724-11d0-AE1F-00A0C90FFFC3}|#13411|500|#13412|0|#6810|0|#13413
diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/TextFile.txt b/Nodejs/Product/Nodejs/FileTemplates/NewItem/TextFile.txt
deleted file mode 100644
index 5f282702b..000000000
--- a/Nodejs/Product/Nodejs/FileTemplates/NewItem/TextFile.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj
index 1320095f4..b9195eff5 100644
--- a/Nodejs/Product/Nodejs/Nodejs.csproj
+++ b/Nodejs/Product/Nodejs/Nodejs.csproj
@@ -601,6 +601,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Commands\DiagnosticsForm.resx">
       <DependentUpon>DiagnosticsForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Options\NodejsNpmOptionsControl.resx">
       <DependentUpon>NodejsNpmOptionsControl.cs</DependentUpon>
@@ -635,6 +636,18 @@
     </ConditionalEmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <ZipItem Include="Templates\Files\EmptyCss\EmptyCss.css" />
+    <ZipItem Include="Templates\Files\EmptyCss\EmptyCss.vstemplate" />
+    <ZipItem Include="Templates\Files\EmptyHtml\EmptyHtml.html" />
+    <ZipItem Include="Templates\Files\EmptyHtml\EmptyHtml.vstemplate" />
+    <ZipItem Include="Templates\Files\EmptyJson\EmptyJson.vstemplate" />
+    <ZipItem Include="Templates\Files\EmptyJs\EmptyJs.js" />
+    <ZipItem Include="Templates\Files\EmptyJs\EmptyJs.vstemplate" />
+    <ZipItem Include="Templates\Files\EmptyLess\EmptyLess.vstemplate" />
+    <ZipItem Include="Templates\Files\EmptyPug\EmptyPug.vstemplate" />
+    <ZipItem Include="Templates\Files\EmptyTs\EmptyTs.vstemplate" />
+    <ZipItem Include="Templates\Files\EmptyXml\EmptyXml.vstemplate" />
+    <ZipItem Include="Templates\Files\EmptyXml\EmptyXml.xml" />
     <Content Include="TypingsAcquisitionTool\index.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -704,6 +717,9 @@
     <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\mine.typings.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\www" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\typings.json" />
+    <ZipItem Include="Templates\Files\EmptyJson\EmptyJson.json" />
+    <ZipItem Include="Templates\Files\EmptyLess\EmptyLess.less" />
+    <ZipItem Include="Templates\Files\EmptyPug\EmptyPug.pug" />
     <None Include="Theme\contrast.vstheme">
       <SubType>Designer</SubType>
     </None>
@@ -739,14 +755,6 @@
       <IncludeInVSIX>true</IncludeInVSIX>
       <VSIXSubPath>RemoteDebug</VSIXSubPath>
     </Content>
-    <Content Include="FileTemplates\NewItem\EmptyTs.ts">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="FileTemplates\NewItem\EmptyHtml.html">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <ZipProject Include="ProjectTemplates\FromExistingCode\FromExistingCode.njsproj">
       <SubType>Designer</SubType>
     </ZipProject>
@@ -904,14 +912,6 @@
       <ResourceName>1000</ResourceName>
       <SubType>Designer</SubType>
     </VSCTCompile>
-    <Content Include="FileTemplates\NewItem\EmptyJs.js">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="FileTemplates\NewItem\TextFile.txt">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <ZipProject Include="ProjectTemplates\AzureNodejsApp\AzureNodejsApp.vstemplate">
       <SubType>Designer</SubType>
     </ZipProject>
@@ -922,10 +922,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="FileTemplates\NewItem\NewItems.vsdir">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <ZipProject Include="ProjectTemplates\AzureNodejsApp\ChangeConfig.ps1" />
     <ZipProject Include="ProjectTemplates\AzureNodejsApp\download.ps1" />
     <ZipProject Include="ProjectTemplates\AzureNodejsApp\AzureNodejsApp.njsproj">
@@ -959,26 +955,6 @@
     <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\package.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\README.md" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\main.css" />
-    <Content Include="FileTemplates\NewItem\EmptyPug.pug">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="FileTemplates\NewItem\EmptyJson.json">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="FileTemplates\NewItem\EmptyXml.xml">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="FileTemplates\NewItem\EmptyCss.css">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="FileTemplates\NewItem\EmptyLess.less">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureWebApp\TypeScriptWebApp.njsproj">
       <SubType>Designer</SubType>
     </TypeScriptProject>
@@ -1161,6 +1137,9 @@
   <ItemGroup>
     <TypeScriptProject Include="ProjectTemplates\TypeScriptAzureExpressApp\mime.d.ts" />
   </ItemGroup>
+  <ItemGroup>
+    <ZipItem Include="Templates\Files\EmptyTs\EmptyTs.ts" />
+  </ItemGroup>
   <PropertyGroup>
     <!--
     To specify a different registry root to register your package, uncomment the TargetRegistryRoot
diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyCss.css b/Nodejs/Product/Nodejs/Templates/Files/EmptyCss/EmptyCss.css
similarity index 100%
rename from Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyCss.css
rename to Nodejs/Product/Nodejs/Templates/Files/EmptyCss/EmptyCss.css
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyCss/EmptyCss.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyCss/EmptyCss.vstemplate
new file mode 100644
index 000000000..7e05e8a45
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyCss/EmptyCss.vstemplate
@@ -0,0 +1,13 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3029"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3030"/>
+    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="414"/>
+    <ProjectType>Node.js</ProjectType>
+    <DefaultName>StyleSheet.css</DefaultName>
+    <SortOrder>410</SortOrder>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem SubType="Code" TargetFileName="$fileinputname$.$fileinputextension$" ReplaceParameters="true">EmptyCss.css</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyHtml.html b/Nodejs/Product/Nodejs/Templates/Files/EmptyHtml/EmptyHtml.html
similarity index 100%
rename from Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyHtml.html
rename to Nodejs/Product/Nodejs/Templates/Files/EmptyHtml/EmptyHtml.html
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyHtml/EmptyHtml.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyHtml/EmptyHtml.vstemplate
new file mode 100644
index 000000000..156169ffb
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyHtml/EmptyHtml.vstemplate
@@ -0,0 +1,13 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3032"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3033"/>
+    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="415"/>
+    <ProjectType>Node.js</ProjectType>
+    <DefaultName>Page.html</DefaultName>
+    <SortOrder>400</SortOrder>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem SubType="Code" TargetFileName="$fileinputname$.$fileinputextension$" ReplaceParameters="true">EmptyHtml.html</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyJs.js b/Nodejs/Product/Nodejs/Templates/Files/EmptyJs/EmptyJs.js
similarity index 100%
rename from Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyJs.js
rename to Nodejs/Product/Nodejs/Templates/Files/EmptyJs/EmptyJs.js
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyJs/EmptyJs.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyJs/EmptyJs.vstemplate
new file mode 100644
index 000000000..471b532f1
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyJs/EmptyJs.vstemplate
@@ -0,0 +1,13 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3007"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3011"/>
+    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="403"/>
+    <ProjectType>Node.js</ProjectType>
+    <DefaultName>JavaScript.js</DefaultName>
+    <SortOrder>100</SortOrder>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem SubType="Code" TargetFileName="$fileinputname$.$fileinputextension$" ReplaceParameters="true">EmptyJs.js</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyJson.json b/Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.json
similarity index 100%
rename from Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyJson.json
rename to Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.json
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate
new file mode 100644
index 000000000..0eef2bd62
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyJson/EmptyJson.vstemplate
@@ -0,0 +1,13 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3023"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3024"/>
+    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="0"/>
+    <ProjectType>Node.js</ProjectType>
+    <DefaultName>Json.json</DefaultName>
+    <SortOrder>420</SortOrder>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem SubType="Code" TargetFileName="$fileinputname$.$fileinputextension$" ReplaceParameters="true">EmptyJson.json</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyLess.less b/Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.less
similarity index 100%
rename from Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyLess.less
rename to Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.less
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate
new file mode 100644
index 000000000..54414796c
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyLess/EmptyLess.vstemplate
@@ -0,0 +1,13 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3038"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3039"/>
+    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="0"/>
+    <ProjectType>Node.js</ProjectType>
+    <DefaultName>StyleSheet.less</DefaultName>
+    <SortOrder>450</SortOrder>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem SubType="Code" TargetFileName="$fileinputname$.$fileinputextension$" ReplaceParameters="true">EmptyLess.less</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyPug.pug b/Nodejs/Product/Nodejs/Templates/Files/EmptyPug/EmptyPug.pug
similarity index 100%
rename from Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyPug.pug
rename to Nodejs/Product/Nodejs/Templates/Files/EmptyPug/EmptyPug.pug
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyPug/EmptyPug.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyPug/EmptyPug.vstemplate
new file mode 100644
index 000000000..045c48ea1
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyPug/EmptyPug.vstemplate
@@ -0,0 +1,13 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3020"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3021"/>
+    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="417"/>
+    <ProjectType>Node.js</ProjectType>
+    <DefaultName>Page.pug</DefaultName>
+    <SortOrder>430</SortOrder>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem SubType="Code" TargetFileName="$fileinputname$.$fileinputextension$" ReplaceParameters="true">EmptyPug.pug</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyTs.ts b/Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.ts
similarity index 100%
rename from Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyTs.ts
rename to Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.ts
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate
new file mode 100644
index 000000000..3023ae072
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyTs/EmptyTs.vstemplate
@@ -0,0 +1,13 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3017"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3018"/>
+    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3"/>
+    <ProjectType>Node.js</ProjectType>
+    <DefaultName>TypeScript.ts</DefaultName>
+    <SortOrder>200</SortOrder>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem SubType="Code" TargetFileName="$fileinputname$.$fileinputextension$" ReplaceParameters="true">EmptyTs.ts</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/Nodejs/Product/Nodejs/Templates/Files/EmptyXml/EmptyXml.vstemplate b/Nodejs/Product/Nodejs/Templates/Files/EmptyXml/EmptyXml.vstemplate
new file mode 100644
index 000000000..61111143d
--- /dev/null
+++ b/Nodejs/Product/Nodejs/Templates/Files/EmptyXml/EmptyXml.vstemplate
@@ -0,0 +1,13 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3035"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3036"/>
+    <Icon Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="416"/>
+    <ProjectType>Node.js</ProjectType>
+    <DefaultName>Document.xml</DefaultName>
+    <SortOrder>490</SortOrder>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem SubType="Code" TargetFileName="$fileinputname$.$fileinputextension$" ReplaceParameters="true">EmptyXml.xml</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
\ No newline at end of file
diff --git a/Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyXml.xml b/Nodejs/Product/Nodejs/Templates/Files/EmptyXml/EmptyXml.xml
similarity index 100%
rename from Nodejs/Product/Nodejs/FileTemplates/NewItem/EmptyXml.xml
rename to Nodejs/Product/Nodejs/Templates/Files/EmptyXml/EmptyXml.xml
diff --git a/Nodejs/Setup/NodejsTools/NodejsTools.wxs b/Nodejs/Setup/NodejsTools/NodejsTools.wxs
index 3455f2687..d54566a2d 100644
--- a/Nodejs/Setup/NodejsTools/NodejsTools.wxs
+++ b/Nodejs/Setup/NodejsTools/NodejsTools.wxs
@@ -9,9 +9,6 @@
 
         <?foreach key in VS;VWD?>
         <DirectoryRef Id="Dir_$(var.key)InstallLocation">
-            <Directory Id="Dir_$(var.key)InstallLocationFileTemplates" Name="FileTemplates">
-                <Directory Id="Dir_$(var.key)FileTemplatesNewItem" Name="NewItem" />
-            </Directory>
             <Directory Id="Dir_$(var.key)TypingsAcquisitionTool" Name="TypingsAcquisitionTool">
                 <Directory Id="Dir_$(var.key)TypingsAcquisitionToolBin" Name="bin" />
             </Directory>
diff --git a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj
index 361e51ad1..6a5fd8089 100644
--- a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj
+++ b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj
@@ -36,26 +36,20 @@
         <File Include="NodeJS_200x.png" />
 
         <!-- Templates -->
-        <File Include="FileTemplates\NewItem\NewItems.vsdir;
-                       FileTemplates\NewItem\TextFile.txt;
-                       FileTemplates\NewItem\EmptyJs.js;
-                       FileTemplates\NewItem\EmptyXml.xml;
-                       FileTemplates\NewItem\EmptyTs.ts;
-                       FileTemplates\NewItem\EmptyLess.less;
-                       FileTemplates\NewItem\EmptyJson.json;
-                       FileTemplates\NewItem\EmptyPug.pug;
-                       FileTemplates\NewItem\EmptyCss.css;
-                       FileTemplates\NewItem\EmptyHtml.html">
-
-            <InstallDirectory>FileTemplatesNewItem</InstallDirectory>
-        </File>
-
-        <ItemTemplate Include="ItemTemplates\JavaScript\UnitTest.zip;
-                               ItemTemplates\JavaScript\TapeUnitTest.zip;
-                               ItemTemplates\JavaScript\MochaUnitTest.zip;
-                               ItemTemplates\JavaScript\TypeScriptUnitTest.zip;
-                               ItemTemplates\JavaScript\TypeScriptTapeUnitTest.zip;
-                               ItemTemplates\JavaScript\TypeScriptMochaUnitTest.zip;"/>
+        <ItemTemplate Include="ItemTemplates\JavaScript\EmptyCss.zip;
+                                ItemTemplates\JavaScript\EmptyHtml.zip;
+                                ItemTemplates\JavaScript\EmptyJs.zip;
+                                ItemTemplates\JavaScript\EmptyJson.zip;
+                                ItemTemplates\JavaScript\EmptyLess.zip;
+                                ItemTemplates\JavaScript\EmptyPug.zip;
+                                ItemTemplates\JavaScript\EmptyTs.zip;
+                                ItemTemplates\JavaScript\EmptyXml.zip;
+                                ItemTemplates\JavaScript\MochaUnitTest.zip;
+                                ItemTemplates\JavaScript\TapeUnitTest.zip;
+                                ItemTemplates\JavaScript\TypeScriptMochaUnitTest.zip;
+                                ItemTemplates\JavaScript\TypeScriptTapeUnitTest.zip;
+                                ItemTemplates\JavaScript\TypeScriptUnitTest.zip;
+                                ItemTemplates\JavaScript\UnitTest.zip;"/>
 
         <ProjectTemplate Include="ProjectTemplates\JavaScript\Node.js\1033\AzureExpress4App.zip;
                                   ProjectTemplates\JavaScript\Node.js\1033\AzureNodejsApp.zip;