diff --git a/brunch-config.js b/brunch-config.js
index 3011d723..1987457c 100644
--- a/brunch-config.js
+++ b/brunch-config.js
@@ -3,7 +3,7 @@ exports.config = {
   files: {
     javascripts: {
       joinTo: {
-        'js/admin_lte2.js': [
+        'assets/admin_lte2.js': [
           "web/static/vendor/themes/admin_lte2/bootstrap/js/bootstrap.min.js",
           "web/static/vendor/themes/admin_lte2/plugins/daterangepicker/daterangepicker.js",
           "web/static/vendor/themes/admin_lte2/plugins/datepicker/bootstrap-datepicker.js",
@@ -13,11 +13,11 @@ exports.config = {
           "web/static/vendor/themes/admin_lte2/js/moment.js",
           "web/static/vendor/themes/admin_lte2/dist/js/app.js",
         ],
-        'js/jquery.min.js': [
+        'assets/jquery.min.js': [
           "web/static/vendor/jQuery-2.1.4.min.js",
           "web/static/vendor/jquery-ui.min.js",
         ],
-        'js/ex_admin_common.js': [
+        'assets/ex_admin_common.js': [
           "web/static/vendor/active_admin.js",
           /^(web\/static\/vendor\/active_admin\/)/,
           "web/static/vendor/best_in_place.js",
@@ -45,22 +45,23 @@ exports.config = {
     //   // }
     // },
     stylesheets: {
-      joinTo: { "css/admin_lte2.css": [
-        "web/static/vendor/themes/admin_lte2/css/ex_admin.css",
-        "web/static/vendor/themes/admin_lte2/bootstrap/css/bootstrap.min.css",
-        "web/static/vendor/themes/admin_lte2/dist/css/AdminLTE.min.css",
-        "web/static/vendor/themes/admin_lte2/dist/css/skins/all-skins.min.css",
-        "web/static/vendor/themes/admin_lte2/css/font-awesome.min.css",
-        "web/static/vendor/themes/admin_lte2/css/ionicons.min.css",
-        "web/static/vendor/themes/admin_lte2/plugins/datepicker/datepicker3.css",
-        "web/static/vendor/themes/admin_lte2/plugins/daterangepicker/daterangepicker-bs3.css",
-        "web/static/vendor/themes/admin_lte2/plugins/select2/select2.css",
-      ],
-      "css/active_admin.css.css": [
-        "web/static/vendor/themes/active_admin/css/active_admin.css.css",
-        "web/static/vendor/themes/admin_lte2/plugins/select2/select2.css",
-      ]
-    }
+      joinTo: {
+        "assets/admin_lte2.css": [
+          "web/static/vendor/themes/admin_lte2/css/ex_admin.css",
+          "web/static/vendor/themes/admin_lte2/bootstrap/css/bootstrap.min.css",
+          "web/static/vendor/themes/admin_lte2/dist/css/AdminLTE.min.css",
+          "web/static/vendor/themes/admin_lte2/dist/css/skins/all-skins.min.css",
+          "web/static/vendor/themes/admin_lte2/css/font-awesome.min.css",
+          "web/static/vendor/themes/admin_lte2/css/ionicons.min.css",
+          "web/static/vendor/themes/admin_lte2/plugins/datepicker/datepicker3.css",
+          "web/static/vendor/themes/admin_lte2/plugins/daterangepicker/daterangepicker-bs3.css",
+          "web/static/vendor/themes/admin_lte2/plugins/select2/select2.css",
+        ],
+        "assets/active_admin.css.css": [
+          "web/static/vendor/themes/active_admin/css/active_admin.css.css",
+          "web/static/vendor/themes/admin_lte2/plugins/select2/select2.css",
+        ]
+      }
     },
     // templates: {
     //   joinTo: 'js/active_admin.js'
diff --git a/lib/ex_admin.ex b/lib/ex_admin.ex
index e99ecdab..0009a976 100644
--- a/lib/ex_admin.ex
+++ b/lib/ex_admin.ex
@@ -100,13 +100,13 @@ defmodule ExAdmin do
 
   in `web/templates/admin/admin_layout.html.eex`
   ```html
-  <link rel='stylesheet' href='<%= static_path(@conn, "/css/admin_custom.css") %>'>
+  <link rel='stylesheet' href='<%= static_path(@conn, "/assets/admin_custom.css") %>'>
 
   <!--
     since this is rendered into the head area, make sure to defer the loading
     of your scripts with `async` to not block rendering.
   -->
-  <script async src='<%= static_path(@conn, "/js/app.js") %>'></script>
+  <script async src='<%= static_path(@conn, "/assets/app.js") %>'></script>
   ```
 
   in `priv/static/css/admin_custom.css`
@@ -246,9 +246,7 @@ defmodule ExAdmin do
 
         nil ->
           raise ArgumentError.exception(
-                  "Association #{assoc_name} is not found.\n#{inspect(resource_model)}.__schema__(:association, #{
-                    inspect(assoc_name)
-                  }) returns nil"
+                  "Association #{assoc_name} is not found.\n#{inspect(resource_model)}.__schema__(:association, #{inspect(assoc_name)}) returns nil"
                 )
 
         _ ->
diff --git a/lib/mix/tasks/admin.install.ex b/lib/mix/tasks/admin.install.ex
index df375fc8..3be7c201 100644
--- a/lib/mix/tasks/admin.install.ex
+++ b/lib/mix/tasks/admin.install.ex
@@ -99,13 +99,13 @@ defmodule Mix.Tasks.Admin.Install do
     status_msg("creating", "css files")
 
     ~w(admin_lte2.css admin_lte2.css.map active_admin.css.css active_admin.css.css.map)
-    |> Enum.each(&copy_vendor(base_path, "css", &1))
+    |> Enum.each(&copy_vendor(base_path, "assets", &1))
 
     status_msg("creating", "js files")
 
     (~w(jquery.min.js admin_lte2.js jquery.min.js.map admin_lte2.js.map) ++
        ~w(ex_admin_common.js ex_admin_common.js.map))
-    |> Enum.each(&copy_vendor(base_path, "js", &1))
+    |> Enum.each(&copy_vendor(base_path, "assets", &1))
 
     copy_vendor_r(base_path, "fonts")
     copy_vendor_r(base_path, "images")
@@ -125,13 +125,13 @@ defmodule Mix.Tasks.Admin.Install do
     status_msg("creating", "css files")
 
     ~w(admin_lte2.css admin_lte2.css.map active_admin.css.css active_admin.css.css.map)
-    |> Enum.each(&copy_file(base_path, "css", &1))
+    |> Enum.each(&copy_file(base_path, "assets", &1))
 
     status_msg("creating", "js files")
 
     (~w(jquery.min.js admin_lte2.js jquery.min.js.map admin_lte2.js.map) ++
        ~w(ex_admin_common.js ex_admin_common.js.map))
-    |> Enum.each(&copy_file(base_path, "js", &1))
+    |> Enum.each(&copy_file(base_path, "assets", &1))
 
     copy_r(base_path, "fonts")
     copy_r(base_path, "images")
@@ -284,9 +284,7 @@ defmodule Mix.Tasks.Admin.Install do
     File.mkdir_p(dest)
 
     IO.puts(
-      "copying #{Path.join([get_package_path(), from_path, path, filename])} -> #{
-        Path.join([dest, filename])
-      }"
+      "copying #{Path.join([get_package_path(), from_path, path, filename])} -> #{Path.join([dest, filename])}"
     )
 
     File.cp(
diff --git a/web/templates/layout/active_admin.html.eex b/web/templates/layout/active_admin.html.eex
index fe66809d..c172e7ad 100644
--- a/web/templates/layout/active_admin.html.eex
+++ b/web/templates/layout/active_admin.html.eex
@@ -10,10 +10,10 @@
     <meta name="csrf-token" id="_csrf_token" content="<%= Plug.CSRFProtection.get_csrf_token %>" />
     <%= favicon() %>
     <title><%= site_title() %></title>
-    <link rel="stylesheet" media="screen" type="text/css" href="<%= static_path(@conn, "/css/active_admin.css.css") %>">
+    <link rel="stylesheet" media="screen" type="text/css" href="<%= static_path(@conn, "/assets/active_admin.css.css") %>">
 
     <!-- jQuery 2.1.4 & jquery-ui 1.11.4 -->
-    <script src="<%= static_path(@conn, "/js/jquery.min.js") %>"></script>
+    <script src="<%= static_path(@conn, "/assets/jquery.min.js") %>"></script>
     <%=
       case Application.get_env(:ex_admin, :head_template) do
         {layout, template} ->
@@ -55,7 +55,7 @@
         </footer>
       </div>
     </body>
-    <script src='<%= static_path(@conn, "/js/ex_admin_common.js") %>'></script>
+    <script src='<%= static_path(@conn, "/assets/ex_admin_common.js") %>'></script>
     <script type="text/javascript">
       $(function() {
         $('#theme-selector').change(function(e) {
diff --git a/web/templates/layout/admin_lte2.html.eex b/web/templates/layout/admin_lte2.html.eex
index 8864e4b6..1bcc8d19 100644
--- a/web/templates/layout/admin_lte2.html.eex
+++ b/web/templates/layout/admin_lte2.html.eex
@@ -10,13 +10,13 @@
     <meta name="csrf-token" id="_csrf_token" content="<%= Plug.CSRFProtection.get_csrf_token %>" />
     <%= favicon() %>
     <title><%= site_title() %></title>
-    <link rel="stylesheet" href="<%= static_path(@conn, "/css/admin_lte2.css") %>">
+    <link rel="stylesheet" href="<%= static_path(@conn, "/assets/admin_lte2.css") %>">
     <!-- Ionicons -->
     <%# <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css"> %>
     <!-- Theme style -->
 
     <!-- jQuery 2.1.4 & jquery-ui 1.11.4 -->
-    <script src="<%= static_path(@conn, "/js/jquery.min.js") %>"></script>
+    <script src="<%= static_path(@conn, "/assets/jquery.min.js") %>"></script>
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -69,8 +69,8 @@
       $.widget.bridge('uibutton', $.ui.button);
     </script>
     <!-- Bootstrap 3.3.5 -->
-    <script src='<%= static_path(@conn, "/js/ex_admin_common.js") %>'></script>
-    <script src='<%= static_path(@conn, "/js/admin_lte2.js") %>'></script>
+    <script src='<%= static_path(@conn, "/assets/ex_admin_common.js") %>'></script>
+    <script src='<%= static_path(@conn, "/assets/admin_lte2.js") %>'></script>
   </body>
   <script type="text/javascript">
     $(function() {