diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
index 642e4848b0..8a38510597 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
@@ -5,22 +5,22 @@
     <title>Link</title>
 
     <!-- Plain link tag -->
-    <link href="HtmlEncode[[/]]site.css" rel="stylesheet" title="&lt;the title>" />
+    <link href="HtmlEncode[[/]]styles/site.css" rel="stylesheet" title="&lt;the title>" />
 
     <!-- Globbed link tag with existing file -->
-    <link rel="stylesheet" title="&lt;the title>" href="HtmlEncode[[/site.css]]" />
+    <link rel="stylesheet" title="&lt;the title>" href="HtmlEncode[[/styles/site.css]]" />
 
     <!-- Globbed link tag with comma separated pattern -->
-    <link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/site.css]]" /><link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/sub/site2.css]]" /><link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/sub/site3.css]]" /><link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/sub/site3.min.css]]" />
+    <link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/styles/site.css]]" /><link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/styles/sub/site2.css]]" /><link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/styles/sub/site3.css]]" /><link rel="stylesheet" title="&lt;the title" href="HtmlEncode[[/styles/sub/site3.min.css]]" />
 
     <!-- Globbed link tag with existing file and exclude -->
-    <link rel="stylesheet" title="&quot;the&quot; title" href="HtmlEncode[[/site.css]]" /><link rel="stylesheet" title="&quot;the&quot; title" href="HtmlEncode[[/sub/site2.css]]" />
+    <link rel="stylesheet" title="&quot;the&quot; title" href="HtmlEncode[[/styles/site.css]]" /><link rel="stylesheet" title="&quot;the&quot; title" href="HtmlEncode[[/styles/sub/site2.css]]" />
 
     <!-- Globbed link tag missing include -->
     <link rel="stylesheet">
 
     <!-- Globbed link tag missing include but with static href -->
-    <link href="HtmlEncode[[/site.css]]" rel="stylesheet" />
+    <link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" />
 
     <!-- Globbed link tag with missing file -->
     
@@ -32,98 +32,98 @@
     
 
     <!-- Globbed link tag with existing file and static href -->
-    <link href="HtmlEncode[[/site.css]]" rel="stylesheet" /><link href="HtmlEncode[[/sub/site2.css]]" rel="stylesheet" />
+    <link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" /><link href="HtmlEncode[[/styles/sub/site2.css]]" rel="stylesheet" />
 
     <!-- Globbed link tag with existing file and static href should dedupe -->
-    <link href="HtmlEncode[[/site.css]]" rel="stylesheet" />
+    <link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" />
 
     <!-- Fallback to static href -->
-    <link href="HtmlEncode[[/site.min.css?a=b&c=d]]" rel="stylesheet" data-extra="test" title="&quot;the&quot; title" />
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css?a=b&c=d]]"]);</script>
+    <link href="HtmlEncode[[/styles/site.min.css?a=b&c=d]]" rel="stylesheet" data-extra="test" title="&quot;the&quot; title" />
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css?a=b&c=d]]"]);</script>
 
     <!-- Fallback from globbed href to static href -->
     
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback from globbed href with exclude to static href -->
     
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback from globbed and static href to static href -->
-    <link href="HtmlEncode[[site.min.css]]" rel="stylesheet" data-extra="test" /><link href="HtmlEncode[[/site.css]]" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test" /><link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback from globbed and static href with exclude to static href -->
-    <link href="HtmlEncode[[site.min.css]]" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback to static href with no primary href -->
     <link rel="stylesheet" data-extra="test">
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback to globbed href -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback to static and globbed href -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]","JavaScriptEncode[[/sub/site2.css]]"]);</script>
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]","JavaScriptEncode[[/styles/sub/site2.css]]"]);</script>
 
     <!-- Fallback to static and globbed href should dedupe -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback to static and globbed href with exclude -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]","JavaScriptEncode[[/sub/site2.css]]"]);</script>
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]","JavaScriptEncode[[/styles/sub/site2.css]]"]);</script>
 
     <!-- Fallback from globbed href to glbobed href -->
     
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback from globbed href with exclude to globbed href -->
     
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback from globbed and static href to globbed href -->
-    <link href="HtmlEncode[[site.min.css]]" rel="stylesheet" data-extra="test" /><link href="HtmlEncode[[/site.css]]" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test" /><link href="HtmlEncode[[/styles/site.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Fallback from globbed and static href with exclude to globbed href -->
-    <link href="HtmlEncode[[site.min.css]]" rel="stylesheet" data-extra="test">
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]"]);</script>
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]"]);</script>
 
     <!-- Kitchen sink, all the attributes -->
-    <link href="HtmlEncode[[site.min.css]]" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css]]","JavaScriptEncode[[/sub/site2.css]]"]);</script>
+    <link href="HtmlEncode[[styles/site.min.css]]" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css]]","JavaScriptEncode[[/styles/sub/site2.css]]"]);</script>
 
     <!-- Fallback to globbed href that doesn't exist -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test" />
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback to globbed href outside webroot -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test" />
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback with missing attribute -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test" />
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback with missing attribute -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test" />
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback with missing attribute -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test" />
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test" />
 
     <!-- Plain link tag with file version -->
-    <link href="HtmlEncode[[/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]" rel="stylesheet" />
+    <link href="HtmlEncode[[/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]" rel="stylesheet" />
 
     <!-- Globbed link tag with existing file and file version -->
-    <link rel="stylesheet" href="HtmlEncode[[/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]" />
+    <link rel="stylesheet" href="HtmlEncode[[/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]" />
 
     <!-- Fallback with file version -->
-    <link href="HtmlEncode[[/site.min.css]]" rel="stylesheet" data-extra="test">
-<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]"]);</script>
+    <link href="HtmlEncode[[/styles/site.min.css]]" rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" class="HtmlEncode[[hidden]]" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("JavaScriptEncode[[visibility]]","JavaScriptEncode[[hidden]]",["JavaScriptEncode[[/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]"]);</script>
 
     <!-- Globbed link tag with existing file, static href and file version -->
-    <link href="HtmlEncode[[/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]" rel="stylesheet" /><link href="HtmlEncode[[/sub/site2.css?v=30cxPex0tA9xEatW7f1Qhnn8tVLAHgE6xwIZhESq0y0]]" rel="stylesheet" /><link href="HtmlEncode[[/sub/site3.css?v=fSxxOr1Q4Dq2uPuzlju5UYGuK0SKABI-ghvaIGEsZDc]]" rel="stylesheet" /><link href="HtmlEncode[[/sub/site3.min.css?v=s8JMmAZxBn0dzuhRtQ0wgOvNBK4XRJRWEC2wfzsVF9M]]" rel="stylesheet" />
+    <link href="HtmlEncode[[/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc]]" rel="stylesheet" /><link href="HtmlEncode[[/styles/sub/site2.css?v=30cxPex0tA9xEatW7f1Qhnn8tVLAHgE6xwIZhESq0y0]]" rel="stylesheet" /><link href="HtmlEncode[[/styles/sub/site3.css?v=fSxxOr1Q4Dq2uPuzlju5UYGuK0SKABI-ghvaIGEsZDc]]" rel="stylesheet" /><link href="HtmlEncode[[/styles/sub/site3.min.css?v=s8JMmAZxBn0dzuhRtQ0wgOvNBK4XRJRWEC2wfzsVF9M]]" rel="stylesheet" />
 </head>
 <body>
 
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
index a5c4e08137..aaf691484c 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
@@ -5,22 +5,22 @@
     <title>Link</title>
 
     <!-- Plain link tag -->
-    <link href="/site.css" rel="stylesheet" title="&lt;the title>" />
+    <link href="/styles/site.css" rel="stylesheet" title="&lt;the title>" />
 
     <!-- Globbed link tag with existing file -->
-    <link rel="stylesheet" title="&lt;the title>" href="/site.css" />
+    <link rel="stylesheet" title="&lt;the title>" href="/styles/site.css" />
 
     <!-- Globbed link tag with comma separated pattern -->
-    <link rel="stylesheet" title="&lt;the title" href="/site.css" /><link rel="stylesheet" title="&lt;the title" href="/sub/site2.css" /><link rel="stylesheet" title="&lt;the title" href="/sub/site3.css" /><link rel="stylesheet" title="&lt;the title" href="/sub/site3.min.css" />
+    <link rel="stylesheet" title="&lt;the title" href="/styles/site.css" /><link rel="stylesheet" title="&lt;the title" href="/styles/sub/site2.css" /><link rel="stylesheet" title="&lt;the title" href="/styles/sub/site3.css" /><link rel="stylesheet" title="&lt;the title" href="/styles/sub/site3.min.css" />
 
     <!-- Globbed link tag with existing file and exclude -->
-    <link rel="stylesheet" title="&quot;the&quot; title" href="/site.css" /><link rel="stylesheet" title="&quot;the&quot; title" href="/sub/site2.css" />
+    <link rel="stylesheet" title="&quot;the&quot; title" href="/styles/site.css" /><link rel="stylesheet" title="&quot;the&quot; title" href="/styles/sub/site2.css" />
 
     <!-- Globbed link tag missing include -->
     <link rel="stylesheet">
 
     <!-- Globbed link tag missing include but with static href -->
-    <link href="/site.css" rel="stylesheet" />
+    <link href="/styles/site.css" rel="stylesheet" />
 
     <!-- Globbed link tag with missing file -->
     
@@ -32,98 +32,98 @@
     
 
     <!-- Globbed link tag with existing file and static href -->
-    <link href="/site.css" rel="stylesheet" /><link href="/sub/site2.css" rel="stylesheet" />
+    <link href="/styles/site.css" rel="stylesheet" /><link href="/styles/sub/site2.css" rel="stylesheet" />
 
     <!-- Globbed link tag with existing file and static href should dedupe -->
-    <link href="/site.css" rel="stylesheet" />
+    <link href="/styles/site.css" rel="stylesheet" />
 
     <!-- Fallback to static href -->
-    <link href="/site.min.css?a=b&amp;c=d" rel="stylesheet" data-extra="test" title="&quot;the&quot; title" />
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css?a=b\u0026c=d"]);</script>
+    <link href="/styles/site.min.css?a=b&amp;c=d" rel="stylesheet" data-extra="test" title="&quot;the&quot; title" />
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css?a=b\u0026c=d"]);</script>
 
     <!-- Fallback from globbed href to static href -->
     
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback from globbed href with exclude to static href -->
     
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback from globbed and static href to static href -->
-    <link href="site.min.css" rel="stylesheet" data-extra="test" /><link href="/site.css" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test" /><link href="/styles/site.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback from globbed and static href with exclude to static href -->
-    <link href="site.min.css" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback to static href with no primary href -->
     <link rel="stylesheet" data-extra="test">
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback to globbed href -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback to static and globbed href -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css","\/sub\/site2.css"]);</script>
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css","\/styles\/sub\/site2.css"]);</script>
 
     <!-- Fallback to static and globbed href should dedupe -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback to static and globbed href with exclude -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css","\/sub\/site2.css"]);</script>
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css","\/styles\/sub\/site2.css"]);</script>
 
     <!-- Fallback from globbed href to glbobed href -->
     
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback from globbed href with exclude to globbed href -->
     
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback from globbed and static href to globbed href -->
-    <link href="site.min.css" rel="stylesheet" data-extra="test" /><link href="/site.css" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test" /><link href="/styles/site.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Fallback from globbed and static href with exclude to globbed href -->
-    <link href="site.min.css" rel="stylesheet" data-extra="test">
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css"]);</script>
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css"]);</script>
 
     <!-- Kitchen sink, all the attributes -->
-    <link href="site.min.css" rel="stylesheet" data-extra="test" />
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css","\/sub\/site2.css"]);</script>
+    <link href="styles/site.min.css" rel="stylesheet" data-extra="test" />
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css","\/styles\/sub\/site2.css"]);</script>
 
     <!-- Fallback to globbed href that doesn't exist -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback to globbed href outside webroot -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback with missing attribute -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback with missing attribute -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback with missing attribute -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test" />
 
     <!-- Plain link tag with file version -->
-    <link href="/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc" rel="stylesheet" />
+    <link href="/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc" rel="stylesheet" />
 
     <!-- Globbed link tag with existing file and file version -->
-    <link rel="stylesheet" href="/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc" />
+    <link rel="stylesheet" href="/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc" />
 
     <!-- Fallback with file version -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test">
-<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc"]);</script>
+    <link href="/styles/site.min.css" rel="stylesheet" data-extra="test">
+<meta name="x-stylesheet-fallback-test" class="hidden" /><script>!function(a,b,c){var d,e=document,f=e.getElementsByTagName("SCRIPT"),g=f[f.length-1].previousElementSibling,h=e.defaultView&&e.defaultView.getComputedStyle?e.defaultView.getComputedStyle(g):g.currentStyle;if(h&&h[a]!==b)for(d=0;d<c.length;d++)e.write('<link rel="stylesheet" href="'+c[d]+'"/>')}("visibility","hidden",["\/styles\/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc"]);</script>
 
     <!-- Globbed link tag with existing file, static href and file version -->
-    <link href="/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc" rel="stylesheet" /><link href="/sub/site2.css?v=30cxPex0tA9xEatW7f1Qhnn8tVLAHgE6xwIZhESq0y0" rel="stylesheet" /><link href="/sub/site3.css?v=fSxxOr1Q4Dq2uPuzlju5UYGuK0SKABI-ghvaIGEsZDc" rel="stylesheet" /><link href="/sub/site3.min.css?v=s8JMmAZxBn0dzuhRtQ0wgOvNBK4XRJRWEC2wfzsVF9M" rel="stylesheet" />
+    <link href="/styles/site.css?v=XY7YsMemPf8AGU4SIX9ED9eOjK1LOQWu2dmCNmh-pQc" rel="stylesheet" /><link href="/styles/sub/site2.css?v=30cxPex0tA9xEatW7f1Qhnn8tVLAHgE6xwIZhESq0y0" rel="stylesheet" /><link href="/styles/sub/site3.css?v=fSxxOr1Q4Dq2uPuzlju5UYGuK0SKABI-ghvaIGEsZDc" rel="stylesheet" /><link href="/styles/sub/site3.min.css?v=s8JMmAZxBn0dzuhRtQ0wgOvNBK4XRJRWEC2wfzsVF9M" rel="stylesheet" />
 </head>
 <body>
 
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
index 40810ebd8f..f1f2158a0a 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
@@ -6,34 +6,34 @@
 </head>
 <body>
     <h2>Script tag helper test</h2>
-    <script src="HtmlEncode[[/]]site.js" data-foo="foo-data1" title="&lt;the title>">
+    <script src="HtmlEncode[[/]]styles/site.js" data-foo="foo-data1" title="&lt;the title>">
         // Regular script with comment in body, and extra properties.
     </script>
 
     <script src="HtmlEncode[[/blank.js?a=b&c=d]]" data-foo="foo-data2" title="&lt;the title>">
         // TagHelper script with comment in body, and extra properties.
     </script>
-<script>(false||document.write("<script src=\"JavaScriptEncode[[/site.js?a=b&c=d]]\" JavaScriptEncode[[data-foo]]=\"JavaScriptEncode[[foo-data2]]\" JavaScriptEncode[[title]]=\"JavaScriptEncode[[&lt;the title>]]\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"JavaScriptEncode[[/styles/site.js?a=b&c=d]]\" JavaScriptEncode[[data-foo]]=\"JavaScriptEncode[[foo-data2]]\" JavaScriptEncode[[title]]=\"JavaScriptEncode[[&lt;the title>]]\"><\/script>"));</script>
 
     <script src="HtmlEncode[[/blank.js]]" title="&quot;the&quot; title">
         // Fallback to globbed src
     </script>
-<script>(false||document.write("<script src=\"JavaScriptEncode[[/site.js]]\" JavaScriptEncode[[title]]=\"JavaScriptEncode[["the" title]]\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"JavaScriptEncode[[/styles/site.js]]\" JavaScriptEncode[[title]]=\"JavaScriptEncode[["the" title]]\"><\/script>"));</script>
 
     <script src="HtmlEncode[[/blank.js]]">
         // Fallback to globbed src with exclude
     </script>
-<script>(false||document.write("<script src=\"JavaScriptEncode[[/site.js]]\"><\/script><script src=\"JavaScriptEncode[[/sub/site2.js]]\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"JavaScriptEncode[[/styles/site.js]]\"><\/script><script src=\"JavaScriptEncode[[/styles/sub/site2.js]]\"><\/script>"));</script>
 
     <script src="HtmlEncode[[/blank.js]]">
         // Fallback to globbed and static src
     </script>
-<script>(false||document.write("<script src=\"JavaScriptEncode[[/site.js]]\"><\/script><script src=\"JavaScriptEncode[[/sub/site2.js]]\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"JavaScriptEncode[[/styles/site.js]]\"><\/script><script src=\"JavaScriptEncode[[/styles/sub/site2.js]]\"><\/script>"));</script>
 
     <script src="HtmlEncode[[/blank.js]]">
         // Fallback to globbed and static src should de-dupe
     </script>
-<script>(false||document.write("<script src=\"JavaScriptEncode[[/site.js]]\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"JavaScriptEncode[[/styles/site.js]]\"><\/script>"));</script>
 
     <script src="HtmlEncode[[/blank.js]]">
         // Fallback to globbed src with missing include
@@ -42,7 +42,7 @@
     <script src="HtmlEncode[[/blank.js]]">
         // Fallback to static and globbed src with missing include
     </script>
-<script>(false||document.write("<script src=\"JavaScriptEncode[[/site.js]]\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"JavaScriptEncode[[/styles/site.js]]\"><\/script>"));</script>
 
     <script src="HtmlEncode[[/blank.js]]">
         // Fallback to globbed src outside of webroot
@@ -55,28 +55,28 @@
     <script data-foo="foo-data3">
         // Valid TagHelper (although no src is provided) script with comment in body, and extra properties.
     </script>
-<script>(false||document.write("<script JavaScriptEncode[[data-foo]]=\"JavaScriptEncode[[foo-data3]]\" src=\"JavaScriptEncode[[/site.js]]\"><\/script>"));</script>
+<script>(false||document.write("<script JavaScriptEncode[[data-foo]]=\"JavaScriptEncode[[foo-data3]]\" src=\"JavaScriptEncode[[/styles/site.js]]\"><\/script>"));</script>
 
     <script src="HtmlEncode[[/blank.js]]">
         // Invalid TagHelper script with comment in body.
     </script>
 
     <!-- Globbed script tag with existing file -->
-    <script src="HtmlEncode[[/site.js]]"></script>
+    <script src="HtmlEncode[[/styles/site.js]]"></script>
 
     <!-- Globbed script tag with existing file and exclude -->
-    <script src="HtmlEncode[[/site.js]]"></script><script src="HtmlEncode[[/sub/site2.js]]"></script>
+    <script src="HtmlEncode[[/styles/site.js]]"></script><script src="HtmlEncode[[/styles/sub/site2.js]]"></script>
 
     <script>
         // Globbed script tag missing include
     </script>
 
-    <script src="HtmlEncode[[/site.js]]">
+    <script src="HtmlEncode[[/styles/site.js]]">
         // Globbed script tag missing include but with static src
     </script>
 
     <!-- Globbed script tag with comma separated include pattern -->
-    <script src="HtmlEncode[[/site.js]]"></script><script src="HtmlEncode[[/sub/site2.js]]"></script><script src="HtmlEncode[[/sub/site3.js]]"></script>
+    <script src="HtmlEncode[[/styles/site.js]]"></script><script src="HtmlEncode[[/styles/sub/site2.js]]"></script><script src="HtmlEncode[[/styles/sub/site3.js]]"></script>
 
     <!-- Globbed script tag with missing file -->
     
@@ -87,32 +87,32 @@
     <!-- Globbed script tag with file outside of webroot -->
     
 
-    <script src="HtmlEncode[[/site.js]]">
+    <script src="HtmlEncode[[/styles/site.js]]">
         // Globbed script tag with existing file and static src
-    </script><script src="HtmlEncode[[/sub/site2.js]]"></script>
+    </script><script src="HtmlEncode[[/styles/sub/site2.js]]"></script>
 
-    <script src="HtmlEncode[[/site.js]]">
+    <script src="HtmlEncode[[/styles/site.js]]">
         // Globbed script tag with existing file and static src should dedupe
     </script>
 
     <script src="HtmlEncode[[/blank.js]]">
         // TagHelper script with comment in body, and file version.
     </script>
-<script>(false||document.write("<script src=\"JavaScriptEncode[[/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"JavaScriptEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]\"><\/script>"));</script>
 
     <script src="HtmlEncode[[/blank.js]]">
         // Fallback to globbed src with file version.
     </script>
-<script>(false||document.write("<script src=\"JavaScriptEncode[[/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"JavaScriptEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]\"><\/script>"));</script>
 
-    <script src="HtmlEncode[[/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]">
+    <script src="HtmlEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]">
         // Regular script with comment in body, and file version.
     </script>
 
     <!-- Globbed script tag with existing files and version -->
-    <script src="HtmlEncode[[/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]"></script><script src="HtmlEncode[[/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0]]"></script><script src="HtmlEncode[[/sub/site3.js?v=lmeAMiqm76lnGyqHhu6PIBHAC0Vt46mgVB_KaG_gGdA]]"></script>
+    <script src="HtmlEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]"></script><script src="HtmlEncode[[/styles/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0]]"></script><script src="HtmlEncode[[/styles/sub/site3.js?v=lmeAMiqm76lnGyqHhu6PIBHAC0Vt46mgVB_KaG_gGdA]]"></script>
 
     <!-- Globbed script tag with existing file, exclude and version -->
-    <script src="HtmlEncode[[/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]"></script><script src="HtmlEncode[[/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0]]"></script>
+    <script src="HtmlEncode[[/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I]]"></script><script src="HtmlEncode[[/styles/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0]]"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
index 0693b89243..69adf8e151 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
@@ -6,34 +6,34 @@
 </head>
 <body>
     <h2>Script tag helper test</h2>
-    <script src="/site.js" data-foo="foo-data1" title="&lt;the title>">
+    <script src="/styles/site.js" data-foo="foo-data1" title="&lt;the title>">
         // Regular script with comment in body, and extra properties.
     </script>
 
     <script src="/blank.js?a=b&amp;c=d" data-foo="foo-data2" title="&lt;the title>">
         // TagHelper script with comment in body, and extra properties.
     </script>
-<script>(false||document.write("<script src=\"\/site.js?a=b\u0026c=d\" data-foo=\"foo-data2\" title=\"\u0026lt;the title\u003E\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"\/styles\/site.js?a=b\u0026c=d\" data-foo=\"foo-data2\" title=\"\u0026lt;the title\u003E\"><\/script>"));</script>
 
     <script src="/blank.js" title="&quot;the&quot; title">
         // Fallback to globbed src
     </script>
-<script>(false||document.write("<script src=\"\/site.js\" title=\"\u0022the\u0022 title\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"\/styles\/site.js\" title=\"\u0022the\u0022 title\"><\/script>"));</script>
 
     <script src="/blank.js">
         // Fallback to globbed src with exclude
     </script>
-<script>(false||document.write("<script src=\"\/site.js\"><\/script><script src=\"\/sub\/site2.js\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"\/styles\/site.js\"><\/script><script src=\"\/styles\/sub\/site2.js\"><\/script>"));</script>
 
     <script src="/blank.js">
         // Fallback to globbed and static src
     </script>
-<script>(false||document.write("<script src=\"\/site.js\"><\/script><script src=\"\/sub\/site2.js\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"\/styles\/site.js\"><\/script><script src=\"\/styles\/sub\/site2.js\"><\/script>"));</script>
 
     <script src="/blank.js">
         // Fallback to globbed and static src should de-dupe
     </script>
-<script>(false||document.write("<script src=\"\/site.js\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"\/styles\/site.js\"><\/script>"));</script>
 
     <script src="/blank.js">
         // Fallback to globbed src with missing include
@@ -42,7 +42,7 @@
     <script src="/blank.js">
         // Fallback to static and globbed src with missing include
     </script>
-<script>(false||document.write("<script src=\"\/site.js\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"\/styles\/site.js\"><\/script>"));</script>
 
     <script src="/blank.js">
         // Fallback to globbed src outside of webroot
@@ -55,28 +55,28 @@
     <script data-foo="foo-data3">
         // Valid TagHelper (although no src is provided) script with comment in body, and extra properties.
     </script>
-<script>(false||document.write("<script data-foo=\"foo-data3\" src=\"\/site.js\"><\/script>"));</script>
+<script>(false||document.write("<script data-foo=\"foo-data3\" src=\"\/styles\/site.js\"><\/script>"));</script>
 
     <script src="/blank.js">
         // Invalid TagHelper script with comment in body.
     </script>
 
     <!-- Globbed script tag with existing file -->
-    <script src="/site.js"></script>
+    <script src="/styles/site.js"></script>
 
     <!-- Globbed script tag with existing file and exclude -->
-    <script src="/site.js"></script><script src="/sub/site2.js"></script>
+    <script src="/styles/site.js"></script><script src="/styles/sub/site2.js"></script>
 
     <script>
         // Globbed script tag missing include
     </script>
 
-    <script src="/site.js">
+    <script src="/styles/site.js">
         // Globbed script tag missing include but with static src
     </script>
 
     <!-- Globbed script tag with comma separated include pattern -->
-    <script src="/site.js"></script><script src="/sub/site2.js"></script><script src="/sub/site3.js"></script>
+    <script src="/styles/site.js"></script><script src="/styles/sub/site2.js"></script><script src="/styles/sub/site3.js"></script>
 
     <!-- Globbed script tag with missing file -->
     
@@ -87,32 +87,32 @@
     <!-- Globbed script tag with file outside of webroot -->
     
 
-    <script src="/site.js">
+    <script src="/styles/site.js">
         // Globbed script tag with existing file and static src
-    </script><script src="/sub/site2.js"></script>
+    </script><script src="/styles/sub/site2.js"></script>
 
-    <script src="/site.js">
+    <script src="/styles/site.js">
         // Globbed script tag with existing file and static src should dedupe
     </script>
 
     <script src="/blank.js">
         // TagHelper script with comment in body, and file version.
     </script>
-<script>(false||document.write("<script src=\"\/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"\/styles\/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I\"><\/script>"));</script>
 
     <script src="/blank.js">
         // Fallback to globbed src with file version.
     </script>
-<script>(false||document.write("<script src=\"\/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I\"><\/script>"));</script>
+<script>(false||document.write("<script src=\"\/styles\/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I\"><\/script>"));</script>
 
-    <script src="/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I">
+    <script src="/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I">
         // Regular script with comment in body, and file version.
     </script>
 
     <!-- Globbed script tag with existing files and version -->
-    <script src="/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I"></script><script src="/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0"></script><script src="/sub/site3.js?v=lmeAMiqm76lnGyqHhu6PIBHAC0Vt46mgVB_KaG_gGdA"></script>
+    <script src="/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I"></script><script src="/styles/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0"></script><script src="/styles/sub/site3.js?v=lmeAMiqm76lnGyqHhu6PIBHAC0Vt46mgVB_KaG_gGdA"></script>
 
     <!-- Globbed script tag with existing file, exclude and version -->
-    <script src="/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I"></script><script src="/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0"></script>
+    <script src="/styles/site.js?v=jx1PJjLX32-xgQQx2BxnckU9QH9DVKkm4-M5bSK869I"></script><script src="/styles/sub/site2.js?v=pwJaxaQxnb-rPAdF2JlAp4xiPNq1XuJFd6TyOOfNF-0"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
index a9336cebb8..5cf25f73be 100644
--- a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
@@ -7,13 +7,13 @@
     <title>Link</title>
 
     <!-- Plain link tag -->
-    <link href="~/site.css" rel="stylesheet" title="&lt;the title>" />
+    <link href="~/styles/site.css" rel="stylesheet" title="&lt;the title>" />
 
     <!-- Globbed link tag with existing file -->
     <link asp-href-include="**/site.css" rel="stylesheet" title="&lt;the title>" />
 
     <!-- Globbed link tag with comma separated pattern -->
-    <link asp-href-include="~/*.css, ~/sub/*.css" rel="stylesheet" title="&lt;the title" />
+    <link asp-href-include="~/styles/*.css, ~/styles/sub/*.css" rel="stylesheet" title="&lt;the title" />
 
     <!-- Globbed link tag with existing file and exclude -->
     <link asp-href-include=" **/*.css" asp-href-exclude="**/site3*.css" rel="stylesheet" title='"the" title' />
@@ -22,7 +22,7 @@
     <link asp-href-exclude="**/site2.css" rel="stylesheet">
 
     <!-- Globbed link tag missing include but with static href -->
-    <link href="~/site.css" asp-href-exclude="**/site2.css" rel="stylesheet" />
+    <link href="~/styles/site.css" asp-href-exclude="**/site2.css" rel="stylesheet" />
 
     <!-- Globbed link tag with missing file -->
     <link asp-href-include="**/notThere.css" rel="stylesheet" />
@@ -34,80 +34,80 @@
     <link asp-href-include="**/appRoot.css" rel="stylesheet">
 
     <!-- Globbed link tag with existing file and static href -->
-    <link href="~/site.css" asp-href-include="**/site2.css" rel="stylesheet" />
+    <link href="~/styles/site.css" asp-href-include="**/site2.css" rel="stylesheet" />
 
     <!-- Globbed link tag with existing file and static href should dedupe -->
-    <link href="~/site.css" asp-href-include="**/site.css" rel="stylesheet" />
+    <link href="~/styles/site.css" asp-href-include="**/site.css" rel="stylesheet" />
 
     <!-- Fallback to static href -->
-    <link href="~/site.min.css?a=b&c=d" rel="stylesheet" data-extra="test" title='"the" title'
-          asp-fallback-href="~/site.css?a=b&c=d"
+    <link href="~/styles/site.min.css?a=b&c=d" rel="stylesheet" data-extra="test" title='"the" title'
+          asp-fallback-href="~/styles/site.css?a=b&c=d"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback from globbed href to static href -->
-    <link asp-href-include="site.min.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+    <link asp-href-include="styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback from globbed href with exclude to static href -->
     <link asp-href-include="**/*.min.css" asp-href-exclude=" **/site3.min.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden">
 
     <!-- Fallback from globbed and static href to static href -->
-    <link href="site.min.css" asp-href-include="site.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+    <link href="styles/site.min.css" asp-href-include="styles/site.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback from globbed and static href with exclude to static href -->
-    <link href="site.min.css" asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css"
+    <link href="styles/site.min.css" asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css"
           rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback to static href with no primary href -->
     <link rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden">
 
     <!-- Fallback to globbed href -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
           asp-fallback-href-include="**/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback to static and globbed href -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-href-include="**/site2.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback to static and globbed href should dedupe -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-href-include="**/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback to static and globbed href with exclude -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-href-include="**/*.css"
           asp-fallback-href-exclude="**/site3*.css"
           asp-fallback-test-class="hidden"
@@ -115,7 +115,7 @@
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback from globbed href to glbobed href -->
-    <link asp-href-include="site.min.css" rel="stylesheet" data-extra="test"
+    <link asp-href-include="styles/site.min.css" rel="stylesheet" data-extra="test"
           asp-fallback-href-include="**/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
@@ -129,14 +129,14 @@
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback from globbed and static href to globbed href -->
-    <link href="site.min.css" asp-href-include="site.css" rel="stylesheet" data-extra="test"
+    <link href="styles/site.min.css" asp-href-include="styles/site.css" rel="stylesheet" data-extra="test"
           asp-fallback-href-include="**/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback from globbed and static href with exclude to globbed href -->
-    <link href="site.min.css" asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css"
+    <link href="styles/site.min.css" asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css"
           rel="stylesheet" data-extra="test"
           asp-fallback-href-include="**/site.css"
           asp-fallback-test-class="hidden"
@@ -144,9 +144,9 @@
           asp-fallback-test-value="hidden">
 
     <!-- Kitchen sink, all the attributes -->
-    <link href="site.min.css" asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css"
+    <link href="styles/site.min.css" asp-href-include="**/*.min.css" asp-href-exclude="**/site3.min.css"
           rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-href-include="**/*.css"
           asp-fallback-href-exclude="**/site3*.css"
           asp-fallback-test-class="hidden"
@@ -154,53 +154,53 @@
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback to globbed href that doesn't exist -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
           asp-fallback-href-include="**/notThere.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback to globbed href outside webroot -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
           asp-fallback-href-include="../**/appRoot.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback with missing attribute -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback with missing attribute -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-value="hidden" />
 
     <!-- Fallback with missing attribute -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility" />
 
     <!-- Plain link tag with file version -->
-    <link href="~/site.css" rel="stylesheet" asp-append-version="true" />
+    <link href="~/styles/site.css" rel="stylesheet" asp-append-version="true" />
 
     <!-- Globbed link tag with existing file and file version -->
     <link asp-href-include="**/site.css" rel="stylesheet" asp-append-version="true" />
 
     <!-- Fallback with file version -->
-    <link href="~/site.min.css" rel="stylesheet" data-extra="test"
-          asp-fallback-href="~/site.css"
+    <link href="~/styles/site.min.css" rel="stylesheet" data-extra="test"
+          asp-fallback-href="~/styles/site.css"
           asp-fallback-test-class="hidden"
           asp-fallback-test-property="visibility"
           asp-fallback-test-value="hidden"
           asp-append-version="true">
 
     <!-- Globbed link tag with existing file, static href and file version -->
-    <link href="~/site.css" asp-href-include="**/*.css" rel="stylesheet" asp-append-version="true" />
+    <link href="~/styles/site.css" asp-href-include="**/*.css" rel="stylesheet" asp-append-version="true" />
 </head>
 <body>
 
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
index e8d2469394..bfe3310737 100644
--- a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
@@ -11,11 +11,11 @@
 </head>
 <body>
     <h2>Script tag helper test</h2>
-    <script src="~/site.js" data-foo="foo-data1" title="&lt;the title>">
+    <script src="~/styles/site.js" data-foo="foo-data1" title="&lt;the title>">
         // Regular script with comment in body, and extra properties.
     </script>
 
-    <script src="~/blank.js?a=b&c=d" asp-fallback-src="~/site.js?a=b&c=d" asp-fallback-test="false" data-foo="foo-data2" title="&lt;the title>">
+    <script src="~/blank.js?a=b&c=d" asp-fallback-src="~/styles/site.js?a=b&c=d" asp-fallback-test="false" data-foo="foo-data2" title="&lt;the title>">
         // TagHelper script with comment in body, and extra properties.
     </script>
 
@@ -31,14 +31,14 @@
     </script>
 
     <script src="~/blank.js"
-            asp-fallback-src="~/site.js"
+            asp-fallback-src="~/styles/site.js"
             asp-fallback-src-include="**/site2.js"
             asp-fallback-test="false">
         // Fallback to globbed and static src
     </script>
 
     <script src="~/blank.js"
-            asp-fallback-src="~/site.js"
+            asp-fallback-src="~/styles/site.js"
             asp-fallback-src-include="**/site.js"
             asp-fallback-test="false">
         // Fallback to globbed and static src should de-dupe
@@ -49,7 +49,7 @@
     </script>
 
     <script src="~/blank.js"
-            asp-fallback-src="~/site.js"
+            asp-fallback-src="~/styles/site.js"
             asp-fallback-src-exclude="**/site3.js"
             asp-fallback-test="false">
         // Fallback to static and globbed src with missing include
@@ -63,11 +63,11 @@
         // Fallback to globbed src outside of webroot
     </script>
 
-    <script asp-fallback-src="~/site.js" asp-fallback-test="false" data-foo="foo-data3">
+    <script asp-fallback-src="~/styles/site.js" asp-fallback-test="false" data-foo="foo-data3">
         // Valid TagHelper (although no src is provided) script with comment in body, and extra properties.
     </script>
 
-    <script src="~/blank.js" asp-fallback-src="~/site.js">
+    <script src="~/blank.js" asp-fallback-src="~/styles/site.js">
         // Invalid TagHelper script with comment in body.
     </script>
 
@@ -85,12 +85,12 @@
         // Globbed script tag missing include
     </script>
 
-    <script src="~/site.js" asp-src-exclude="**/site2.js">
+    <script src="~/styles/site.js" asp-src-exclude="**/site2.js">
         // Globbed script tag missing include but with static src
     </script>
 
     <!-- Globbed script tag with comma separated include pattern -->
-    <script asp-src-include="~/*.js, ~/sub/*.js"></script>
+    <script asp-src-include="~/styles/*.js, ~/styles/sub/*.js"></script>
 
     <!-- Globbed script tag with missing file -->
     <script asp-src-include="**/notThere.js"></script>
@@ -101,15 +101,15 @@
     <!-- Globbed script tag with file outside of webroot -->
     <script asp-src-include="**/appRoot.js"></script>
 
-    <script src="~/site.js" asp-src-include="**/site2.js">
+    <script src="~/styles/site.js" asp-src-include="**/site2.js">
         // Globbed script tag with existing file and static src
     </script>
 
-    <script src="~/site.js" asp-src-include="**/site.js">
+    <script src="~/styles/site.js" asp-src-include="**/site.js">
         // Globbed script tag with existing file and static src should dedupe
     </script>
 
-    <script src="~/blank.js" asp-fallback-src="~/site.js" asp-fallback-test="false" asp-append-version="true">
+    <script src="~/blank.js" asp-fallback-src="~/styles/site.js" asp-fallback-test="false" asp-append-version="true">
         // TagHelper script with comment in body, and file version.
     </script>
 
@@ -117,7 +117,7 @@
         // Fallback to globbed src with file version.
     </script>
 
-    <script src="~/site.js" asp-append-version="true">
+    <script src="~/styles/site.js" asp-append-version="true">
         // Regular script with comment in body, and file version.
     </script>
 
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes
new file mode 100644
index 0000000000..54a3709b28
--- /dev/null
+++ b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes
@@ -0,0 +1,2 @@
+site*.css eol=crlf
+site*.js  eol=crlf
\ No newline at end of file
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/site.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/site.css
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/site.js b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/site.js
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.css
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.js b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.js
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.css
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.js b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.js
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.min.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.min.css
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css