diff --git a/zero.Web.UI/webpack.config.js b/zero.Web.UI/webpack.config.js
index 3ca4fb28..213c3c4f 100644
--- a/zero.Web.UI/webpack.config.js
+++ b/zero.Web.UI/webpack.config.js
@@ -16,7 +16,7 @@ module.exports = {
 
   // output paths
   output: {
-    path: path.resolve(__dirname, 'wwwroot/Assets'),
+    path: path.resolve(__dirname, 'Assets'),
     filename: '[name].js',
     publicPath: '/Assets/'
   },
diff --git a/zero.Web.UI/webpack.prod.js b/zero.Web.UI/webpack.prod.js
index 983c6f6c..a1e50c6c 100644
--- a/zero.Web.UI/webpack.prod.js
+++ b/zero.Web.UI/webpack.prod.js
@@ -9,6 +9,12 @@ module.exports = merge(config, {
   mode: 'production',
   devtool: 'source-map',
 
+  output: {
+    path: path.resolve(__dirname, 'wwwroot/Assets'),
+    filename: '[name].js',
+    publicPath: '/Assets/'
+  },
+
   plugins: [
     new MiniCssExtractPlugin({
       filename: "app.css",
diff --git a/zero.Web/ZeroApplicationBuilderExtensions.cs b/zero.Web/ZeroApplicationBuilderExtensions.cs
index ce823a42..10e515fd 100644
--- a/zero.Web/ZeroApplicationBuilderExtensions.cs
+++ b/zero.Web/ZeroApplicationBuilderExtensions.cs
@@ -68,7 +68,7 @@ namespace zero.Web
       app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions()
       {
         HotModuleReplacement = true,
-        ProjectPath = webUiPath
+        ProjectPath = webUiPath,
       });
       #pragma warning restore CS0618
 
diff --git a/zero.Web/zero.Web.csproj b/zero.Web/zero.Web.csproj
index 090a7a41..2826743c 100644
--- a/zero.Web/zero.Web.csproj
+++ b/zero.Web/zero.Web.csproj
@@ -19,5 +19,9 @@
   <ItemGroup>
     <ProjectReference Include="..\zero.Core\zero.Core.csproj" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Include="../zero.Web.UI/Assets/**/*" Link="wwwroot\Assets\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest"  />
+  </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/zero.sln b/zero.sln
index b90c7f0e..f92cd87e 100644
--- a/zero.sln
+++ b/zero.sln
@@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zero.Commerce.Backoffice",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commerce", "Commerce", "{8FC2D7C8-AE39-41A5-AB95-053737BB3D55}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zero.Web", "zero.Web\zero.Web.csproj", "{06156006-7684-41EC-8BD4-3B2A762147CD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zero.Web", "zero.Web\zero.Web.csproj", "{06156006-7684-41EC-8BD4-3B2A762147CD}"
 EndProject
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "zero.Web.UI", "zero.Web.UI\", "{8CE1A69A-35DB-4748-AE1C-86F5BC2E11D4}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -38,6 +38,8 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "zero.Web.UI", "zero.Web.UI\
 		SlnRelativePath = "zero.Web.UI\"
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8FF8B328-93E3-4467-87DB-A273C09AAADC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -74,6 +76,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{63A8AD15-15F0-4555-BD62-C38B4465FFC1} = {8FC2D7C8-AE39-41A5-AB95-053737BB3D55}
+		{83473041-7A1B-40ED-9FD0-968B22EB36B3} = {8FF8B328-93E3-4467-87DB-A273C09AAADC}
 		{9AB4C946-2337-43A2-8B07-30EC97D8372D} = {8FC2D7C8-AE39-41A5-AB95-053737BB3D55}
 		{8FC2D7C8-AE39-41A5-AB95-053737BB3D55} = {EB22CADA-EB9B-4066-A110-3D14DDDBF625}
 	EndGlobalSection