18 files changed, 15 insertions, 15 deletions
diff --git a/README.md b/README.md
index 4f88146d..a2f4ab32 100644
--- a/README.md
+++ b/README.md
@@ -361,11 +361,11 @@ JavaScript. All modern JavaScript should be added to the [content/frontend/](/co
 When adding a new bundle, the layout name (html) and bundle name (js) should
 match to make it easier to find:
 
-1. Add the new bundle to `content/frontend/bundles/<bundle-name>.js`
+1. Add the new bundle to `content/frontend/<bundle-name>/<bundle-name>.js`
 1. Import the bundle in the html file `layouts/<bundle-name>.html`:
 
    ```html
-   <script src="<%= @items['/frontend/bundles/<bundle-name>.*'].path %>"></script>
+   <script src="<%= @items['/frontend/<bundle-name>/<bundle-name>.*'].path %>"></script>
    ```
 
 You should replace `<bundle-name>` with whatever you'd like to call your
diff --git a/content/frontend/bundles/404.js b/content/frontend/404/404.js
index 41845bdb..41845bdb 100644
--- a/content/frontend/bundles/404.js
+++ b/content/frontend/404/404.js
diff --git a/content/frontend/bundles/archives.js b/content/frontend/archives/archives.js
index 4cd0a304..b78cbd06 100644
--- a/content/frontend/bundles/archives.js
+++ b/content/frontend/archives/archives.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import Banner from '../components/banner/banner.vue';
+import Banner from '../shared/components/banner.vue';
 
 document.addEventListener('DOMContentLoaded', () => {
   const urlParams = window.location.search;
diff --git a/content/frontend/components/navigation_toggle/navigation_toggle.vue b/content/frontend/default/components/navigation_toggle.vue
index db5ef074..db5ef074 100644
--- a/content/frontend/components/navigation_toggle/navigation_toggle.vue
+++ b/content/frontend/default/components/navigation_toggle.vue
diff --git a/content/frontend/components/version_banner/version_banner.vue b/content/frontend/default/components/version_banner.vue
index 41603419..540e547d 100644
--- a/content/frontend/components/version_banner/version_banner.vue
+++ b/content/frontend/default/components/version_banner.vue
@@ -1,5 +1,5 @@
 <script>
-import Banner from '../banner/banner.vue';
+import Banner from '../../shared/components/banner.vue';
 
 export default {
   components: {
diff --git a/content/frontend/bundles/default.js b/content/frontend/default/default.js
index 33df43ea..447bf7f1 100644
--- a/content/frontend/bundles/default.js
+++ b/content/frontend/default/default.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import NavigationToggle from '../components/navigation_toggle/navigation_toggle.vue';
-import VersionBanner from '../components/version_banner/version_banner.vue';
+import NavigationToggle from './components/navigation_toggle.vue';
+import VersionBanner from './components/version_banner.vue';
 
 document.addEventListener('DOMContentLoaded', () => {
   const versionBanner = document.querySelector('#js-version-banner');
diff --git a/content/frontend/bundles/feedback.js b/content/frontend/feedback/feedback.js
index 628c871e..628c871e 100644
--- a/content/frontend/bundles/feedback.js
+++ b/content/frontend/feedback/feedback.js
diff --git a/content/frontend/bundles/home.js b/content/frontend/home/home.js
index 40703593..40703593 100644
--- a/content/frontend/bundles/home.js
+++ b/content/frontend/home/home.js
diff --git a/content/frontend/components/banner/banner.vue b/content/frontend/shared/components/banner.vue
index 3748bf8e..3748bf8e 100644
--- a/content/frontend/components/banner/banner.vue
+++ b/content/frontend/shared/components/banner.vue
diff --git a/jest.config.js b/jest.config.js
index 2a0bd2c5..f3d470ae 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -3,7 +3,7 @@ const moduleNameMapper = {
 };
 
 module.exports = {
-  testMatch: ['<rootDir>/spec/javascripts/**/**/*_spec.js'],
+  testMatch: ['<rootDir>/spec/frontend/**/**/*_spec.js'],
   moduleFileExtensions: ['js', 'json', 'vue'],
   moduleNameMapper,
   cacheDirectory: '<rootDir>/tmp/cache/jest',
diff --git a/layouts/404.html b/layouts/404.html
index b437fbf1..59ad2d5b 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -18,7 +18,7 @@
   <script type="application/javascript" src="<%= @items['/assets/javascripts/badges.*'].path %>"></script>
   <%= render '/docsearch.*' %>
   <script type="application/javascript" src="<%= @items['/assets/javascripts/404.*'].path %>"></script>
-  <script src="<%= @items['/frontend/bundles/404.*'].path %>"></script>
+  <script src="<%= @items['/frontend/404/404.*'].path %>"></script>
   <% if ENV['NANOC_ENV'] == 'production' %>
   <%# Add analytics only in production %>
     <%= render '/analytics.*' %>
diff --git a/layouts/archives.html b/layouts/archives.html
index 20ae661b..fef4d9b8 100644
--- a/layouts/archives.html
+++ b/layouts/archives.html
@@ -34,7 +34,7 @@
   <script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script>
   <script type="application/javascript" src="<%= @items['/assets/javascripts/clipboardjs.*'].path %>"></script>
   <script type="application/javascript" src="<%= @items['/assets/javascripts/badges.*'].path %>"></script>
-  <script src="<%= @items['/frontend/bundles/archives.*'].path %>"></script>
+  <script src="<%= @items['/frontend/archives/archives.*'].path %>"></script>
   <%= render '/footer.*' %>
   <%= render '/docsearch.*' %>
   <% if ENV['NANOC_ENV'] == 'production' %>
diff --git a/layouts/default.html b/layouts/default.html
index eebef397..999eaae0 100644
--- a/layouts/default.html
+++ b/layouts/default.html
@@ -90,6 +90,6 @@
   <script src="<%= @items['/assets/javascripts/docs.*'].path %>"></script>
   <script src="<%= @items['/assets/javascripts/global-nav.*'].path %>"></script>
   <script src="<%= @items['/assets/javascripts/tables.*'].path %>"></script>
-  <script src="<%= @items['/frontend/bundles/default.*'].path %>" data-cookieconsent="ignore"></script>
+  <script src="<%= @items['/frontend/default/default.*'].path %>" data-cookieconsent="ignore"></script>
 </body>
 </html>
diff --git a/layouts/feedback.html b/layouts/feedback.html
index bd945cef..d3fead45 100644
--- a/layouts/feedback.html
+++ b/layouts/feedback.html
@@ -242,6 +242,6 @@
       }
     };
   </script>
-  <script src="<%= @items['/frontend/bundles/feedback.*'].path %>"></script>
+  <script src="<%= @items['/frontend/feedback/feedback.*'].path %>"></script>
   <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
 <% end %>
diff --git a/layouts/home.html b/layouts/home.html
index 2736aa47..93e7dde4 100644
--- a/layouts/home.html
+++ b/layouts/home.html
@@ -29,6 +29,6 @@
       <%= render '/analytics.*' %>
     <% end %>
     <%= render '/schema-microdata.*' %>
-    <script src="<%= @items['/frontend/bundles/home.*'].path %>"></script>
+    <script src="<%= @items['/frontend/home/home.*'].path %>"></script>
   </body>
 </html>
diff --git a/rollup.config.js b/rollup.config.js
index ed5ee25f..8ce95b44 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -8,7 +8,7 @@ function mapDirectory(file) {
   return file.replace('content/', 'public/');
 }
 
-module.exports = glob.sync('content/frontend/bundles/*.js').map(file => ({
+module.exports = glob.sync('content/frontend/**/*.js').map(file => ({
   input: file,
   output: {
     file: mapDirectory(file),
diff --git a/spec/javascripts/components/navigation_toggle/navigation_toggle_spec.js b/spec/frontend/default/components/navigation_toggle_spec.js
index ded96937..730dbae0 100644
--- a/spec/javascripts/components/navigation_toggle/navigation_toggle_spec.js
+++ b/spec/frontend/default/components/navigation_toggle_spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import NavigationToggle from '../../../../content/frontend/components/navigation_toggle/navigation_toggle.vue';
+import NavigationToggle from '../../../../content/frontend/default/components/navigation_toggle.vue';
 
 describe('component: Navigation Toggle', () => {
   let wrapper;
diff --git a/spec/javascripts/components/banner/banner_spec.js b/spec/frontend/shared/components/banner_spec.js
index 5ecc6285..1de635b4 100644
--- a/spec/javascripts/components/banner/banner_spec.js
+++ b/spec/frontend/shared/components/banner_spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import Banner from '../../../../content/frontend/components/banner/banner.vue';
+import Banner from '../../../../content/frontend/shared/components/banner.vue';
 
 const propsData = { text: 'Some text', show: true };