diff --git a/src/assets/js/features/holidays/data/holidays.yml b/src/assets/js/components/holidays/data/holidays.yml
similarity index 100%
rename from src/assets/js/features/holidays/data/holidays.yml
rename to src/assets/js/components/holidays/data/holidays.yml
diff --git a/src/assets/js/features/holidays/holidays.js b/src/assets/js/components/holidays/holidays.js
similarity index 100%
rename from src/assets/js/features/holidays/holidays.js
rename to src/assets/js/components/holidays/holidays.js
diff --git a/src/assets/js/features/menu.js b/src/assets/js/components/menu.js
similarity index 100%
rename from src/assets/js/features/menu.js
rename to src/assets/js/components/menu.js
diff --git a/src/assets/js/features/openLinksInPortal.js b/src/assets/js/components/openLinksInPortal.js
similarity index 100%
rename from src/assets/js/features/openLinksInPortal.js
rename to src/assets/js/components/openLinksInPortal.js
diff --git a/src/assets/js/features/portal.js b/src/assets/js/components/portal.js
similarity index 100%
rename from src/assets/js/features/portal.js
rename to src/assets/js/components/portal.js
diff --git a/src/assets/js/features/holidays/index.js b/src/assets/js/features/holidays/index.js
deleted file mode 100644
index a32d4c02..00000000
--- a/src/assets/js/features/holidays/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { getHolidays } from './holidays'
diff --git a/src/assets/js/features/index.js b/src/assets/js/features/index.js
deleted file mode 100644
index c8596700..00000000
--- a/src/assets/js/features/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { getHolidays } from './holidays'
-export { menuMobile } from './menu'
-export { openLinksInPortal } from './openLinksInPortal';
diff --git a/src/assets/js/index.js b/src/assets/js/index.js
index aa0e9214..831cf9ae 100644
--- a/src/assets/js/index.js
+++ b/src/assets/js/index.js
@@ -1,10 +1,14 @@
-import { menuMobile, openLinksInPortal, getHolidays } from './features';
-import analytics from './analytics';
+import { getHolidays } from './components/holidays/holidays';
+import { menuMobile } from './components/menu';
+import { openLinksInPortal } from './components/openLinksInPortal';
+import analytics from './utils/analytics';
 
 import elcatToggleList from './pages/elcat';
 import { resbncBbTable } from './pages/resbnc';
 
-import { mutationObserver, targetBlank, setCurrentYear } from './utils'
+import { mutationObserver } from './utils/mutationObserver';
+import { targetBlank } from './utils/targetBlank';
+import { setCurrentYear } from './utils/currentYear';
 
 
 document.addEventListener("DOMContentLoaded", function () {
diff --git a/src/assets/js/analytics.js b/src/assets/js/utils/analytics.js
similarity index 100%
rename from src/assets/js/analytics.js
rename to src/assets/js/utils/analytics.js
diff --git a/src/assets/js/utils/index.js b/src/assets/js/utils/index.js
deleted file mode 100644
index 367eb1ed..00000000
--- a/src/assets/js/utils/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { mutationObserver } from './mutationObserver';
-export { targetBlank } from './targetBlank';
-export { setCurrentYear } from './currentYear';
-export { isMobile } from './isMobile';