diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr
deleted file mode 100644
index 82f9caaec1f..00000000000
--- a/setup/Swix/Microsoft.FSharp.Dependencies/Dependencies.swr
+++ /dev/null
@@ -1,9 +0,0 @@
-use vs
-
-package name=Microsoft.FSharp.Dependencies
- version=$(VsixVersion)
-
-vs.dependencies
- vs.dependency id=Microsoft.FSharp.SDK
- version=$(VsixVersion)
- type=Required
diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj
index 268f1d84dea..67f9f02f962 100644
--- a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj
+++ b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj
@@ -12,8 +12,7 @@
-
-
+
diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Package.swr
similarity index 86%
rename from setup/Swix/Microsoft.FSharp.Dependencies/Files.swr
rename to setup/Swix/Microsoft.FSharp.Dependencies/Package.swr
index 9b2836fd190..bd975fbc95f 100644
--- a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.Dependencies/Package.swr
@@ -3,6 +3,11 @@ use vs
package name=Microsoft.FSharp.Dependencies
version=$(VsixVersion)
+vs.dependencies
+ vs.dependency id=Microsoft.FSharp.SDK
+ version=$(VsixVersion)
+ type=Required
+
folder "InstallDir:MSBuild\Microsoft\VisualStudio\v$(VSGeneralVersion)\FSharp"
file "Microsoft.FSharp.targets" source="$(SetupShimsDir)\Microsoft.FSharp.Shim.targets"
file "Microsoft.Portable.FSharp.targets" source="$(SetupShimsDir)\Microsoft.Portable.FSharp.Shim.targets"
diff --git a/setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr b/setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr
deleted file mode 100644
index 9ed63a9ff0c..00000000000
--- a/setup/Swix/Microsoft.FSharp.IDE/Dependencies.swr
+++ /dev/null
@@ -1,19 +0,0 @@
-use vs
-
-package name=Microsoft.FSharp.IDE
- version=$(VsixVersion)
-
-vs.dependencies
- vs.dependency id=Microsoft.FSharp.Dependencies
- version=$(VsixVersion)
- type=Required
-
- vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
- version=$(VsixVersion)
- type=Required
- when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
-
- vs.dependency id=Microsoft.FSharp.VSIX.Full.Resources
- version=$(VsixVersion)
- type=Required
- when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
diff --git a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj
index e7226c491eb..a454fc2c606 100644
--- a/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj
+++ b/setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj
@@ -10,8 +10,7 @@
-
-
+
diff --git a/setup/Swix/Microsoft.FSharp.IDE/Files.swr b/setup/Swix/Microsoft.FSharp.IDE/Package.swr
similarity index 57%
rename from setup/Swix/Microsoft.FSharp.IDE/Files.swr
rename to setup/Swix/Microsoft.FSharp.IDE/Package.swr
index 79257b19395..8184815f837 100644
--- a/setup/Swix/Microsoft.FSharp.IDE/Files.swr
+++ b/setup/Swix/Microsoft.FSharp.IDE/Package.swr
@@ -3,6 +3,16 @@ use vs
package name=Microsoft.FSharp.IDE
version=$(VsixVersion)
+vs.dependencies
+ vs.dependency id=Microsoft.FSharp.Dependencies
+ version=$(VsixVersion)
+ type=Required
+
+ vs.dependency id=Microsoft.FSharp.VSIX.Full.Core
+ version=$(VsixVersion)
+ type=Required
+ when=Microsoft.VisualStudio.Product.Enterprise,Microsoft.VisualStudio.Product.Professional,Microsoft.VisualStudio.Product.Community
+
folder "InstallDir:Common7\IDE\NewScriptItems"
file source="$(SetupResourcesDir)\NewFileDialog\Script\NewFSharpScriptItems.vsdir"
file source="$(SetupResourcesDir)\NewFileDialog\Script\Script.fsx"