diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Assets.json b/src/Orchard.Web/Modules/Orchard.Resources/Assets.json
index cbefb5214..eded77ea6 100644
--- a/src/Orchard.Web/Modules/Orchard.Resources/Assets.json
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Assets.json
@@ -91,6 +91,6 @@
     },
     {
         "inputs": [ "Assets/Js/Uri/uri.js" ],
-        "output": "Scripts/uri.js"
+        "output": "Scripts/Uri/uri.js"
     }
 ]
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
index c5d47cd73..0b5dc36bd 100644
--- a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
@@ -772,8 +772,8 @@
     <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry.min.js" />
     <Content Include="Scripts\Underscore\underscore.js" />
     <Content Include="Scripts\Underscore\underscore.min.js" />
-    <Content Include="Scripts\uri.js" />
-    <Content Include="Scripts\uri.min.js" />
+    <Content Include="Scripts\Uri\uri.js" />
+    <Content Include="Scripts\Uri\uri.min.js" />
     <Content Include="Styles\Bootstrap\bootstrap-grid.css" />
     <Content Include="Styles\Bootstrap\bootstrap-grid.min.css" />
     <Content Include="Styles\Bootstrap\bootstrap-reboot.css" />
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Uri.cs b/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Uri.cs
index cbd911f14..123803f94 100644
--- a/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Uri.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Uri.cs
@@ -4,7 +4,7 @@ namespace Orchard.Resources.ResourceManifests {
     public class Uri : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineScript("Uri").SetUrl("uri.min.js", "uri.js").SetVersion("1.16.1");
+            manifest.DefineScript("Uri").SetUrl("Uri/uri.min.js", "Uri/uri.js").SetVersion("1.16.1");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Scripts/uri.js b/src/Orchard.Web/Modules/Orchard.Resources/Scripts/Uri/uri.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Resources/Scripts/uri.js
rename to src/Orchard.Web/Modules/Orchard.Resources/Scripts/Uri/uri.js
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Scripts/uri.min.js b/src/Orchard.Web/Modules/Orchard.Resources/Scripts/Uri/uri.min.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Resources/Scripts/uri.min.js
rename to src/Orchard.Web/Modules/Orchard.Resources/Scripts/Uri/uri.min.js