diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Assets.json b/src/Orchard.Web/Modules/Orchard.Resources/Assets.json
index c5668f4b0..066fe967a 100644
--- a/src/Orchard.Web/Modules/Orchard.Resources/Assets.json
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Assets.json
@@ -83,7 +83,7 @@
     },
     {
         "inputs": [ "Assets/Js/Moment/moment.js" ],
-        "output": "Scripts/moment.js"
+        "output": "Scripts/Moment/moment.js"
     },
     {
         "inputs": [ "Assets/Js/jQuery.BlockUI/jquery.blockui.js" ],
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
index d543d7712..7ed72e09a 100644
--- a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
@@ -766,8 +766,8 @@
     <Content Include="Scripts\jQuery\jquery.min.js" />
     <Content Include="Scripts\Knockout\knockout.js" />
     <Content Include="Scripts\Knockout\knockout.min.js" />
-    <Content Include="Scripts\moment.js" />
-    <Content Include="Scripts\moment.min.js" />
+    <Content Include="Scripts\Moment\moment.js" />
+    <Content Include="Scripts\Moment\moment.min.js" />
     <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry.js" />
     <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry.min.js" />
     <Content Include="Scripts\underscore.js" />
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Moment.cs b/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Moment.cs
index 8c12fd156..8fe748a9f 100644
--- a/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Moment.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Moment.cs
@@ -4,7 +4,9 @@ namespace Orchard.Resources.ResourceManifests {
     public class Moment : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineScript("Moment").SetUrl("moment.min.js", "moment.js").SetVersion("2.10.6");
+            manifest.DefineScript("Moment")
+                .SetUrl("Moment/moment.min.js", "Moment/moment.js")
+                .SetVersion("2.10.6");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Scripts/moment.js b/src/Orchard.Web/Modules/Orchard.Resources/Scripts/Moment/moment.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Resources/Scripts/moment.js
rename to src/Orchard.Web/Modules/Orchard.Resources/Scripts/Moment/moment.js
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Scripts/moment.min.js b/src/Orchard.Web/Modules/Orchard.Resources/Scripts/Moment/moment.min.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Resources/Scripts/moment.min.js
rename to src/Orchard.Web/Modules/Orchard.Resources/Scripts/Moment/moment.min.js