diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
similarity index 93%
rename from web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js
rename to web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
index 90a39ca2..771d49e7 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
@@ -1,32 +1,5 @@
 'use strict';
 
-// Require images
-require('../images/logo.svg');
-require('../images/logo_wide.svg');
-require('../images/favicon_ep.ico');
-require('../images/at.png');
-require('../images/ch.png');
-require('../images/de.png');
-require('../images/fr.png');
-require('../images/badge_skipass.png');
-
-require('../images/icons/tx_eptheme_gridelements_half_and_two_quarters.png');
-require('../images/icons/tx_eptheme_gridelements_halves.png');
-require('../images/icons/tx_eptheme_gridelements_quarters.png');
-require('../images/icons/tx_eptheme_gridelements_thirds.png');
-require('../images/icons/tx_eptheme_gridelements_two_quarters_and_half.png');
-
-require('../images/logo_boarderweek.svg');
-require('../images/favicon_sbw.ico');
-require('../images/logo_snowzone.svg');
-require('../images/favicon_sz.ico');
-require('../images/logo_uni_champ.svg');
-require('../images/favicon_uch.ico');
-
-require('leaflet/dist/images/marker-icon.png');
-require('leaflet/dist/images/marker-icon-2x.png');
-require('leaflet/dist/images/marker-shadow.png');
-
 // Import dependencies
 import Vue from 'vue'
 import VueSession from 'vue-session'
@@ -45,7 +18,7 @@ require('picturefill');
 require('leaflet');
 
 // Import components
-import EventBus from './bus'
+import EventBus from './_bus'
 import SearchBar from './components/SearchBar.vue'
 import SearchBox from './components/SearchBox.vue'
 import SearchResult from './components/SearchResult.vue'
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/bus.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_bus.js
similarity index 100%
rename from web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/bus.js
rename to web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_bus.js
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/filtersettings.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_filtersettings.js
similarity index 100%
rename from web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/filtersettings.js
rename to web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_filtersettings.js
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js
new file mode 100644
index 00000000..fbf46c9f
--- /dev/null
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js
@@ -0,0 +1,28 @@
+'use strict';
+
+// Require images
+require('../images/logo.svg');
+require('../images/logo_wide.svg');
+require('../images/favicon_ep.ico');
+require('../images/at.png');
+require('../images/ch.png');
+require('../images/de.png');
+require('../images/fr.png');
+require('../images/badge_skipass.png');
+
+require('../images/icons/tx_eptheme_gridelements_half_and_two_quarters.png');
+require('../images/icons/tx_eptheme_gridelements_halves.png');
+require('../images/icons/tx_eptheme_gridelements_quarters.png');
+require('../images/icons/tx_eptheme_gridelements_thirds.png');
+require('../images/icons/tx_eptheme_gridelements_two_quarters_and_half.png');
+
+require('../images/logo_boarderweek.svg');
+require('../images/favicon_sbw.ico');
+require('../images/logo_snowzone.svg');
+require('../images/favicon_sz.ico');
+require('../images/logo_uni_champ.svg');
+require('../images/favicon_uch.ico');
+
+require('leaflet/dist/images/marker-icon.png');
+require('leaflet/dist/images/marker-icon-2x.png');
+require('leaflet/dist/images/marker-shadow.png');
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/styles.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_styles.js
similarity index 100%
rename from web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/styles.js
rename to web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_styles.js
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js
index 80df43af..5bea8243 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // Main app
-require('./app');
+require('./_app');
 
 // Main and vendor styles
-require('./styles');
+require('./_styles');
 
 // Brand specific styles
 require('../scss/main_boarderweek.scss');
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/AjaxContent.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/AjaxContent.vue
index fd1b365f..ec659c7b 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/AjaxContent.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/AjaxContent.vue
@@ -8,7 +8,7 @@
 </template>
 <script>
     import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
     const $window = $(window);
 
     export default {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ConceptButtons.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ConceptButtons.vue
index 41473a09..a1394889 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ConceptButtons.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ConceptButtons.vue
@@ -7,7 +7,7 @@
     </div>
 </template>
 <script>
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
 
     export default {
         props: [ 'concepts' ],
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ContactForm.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ContactForm.vue
index f00b9440..23ce6e75 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ContactForm.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ContactForm.vue
@@ -1,6 +1,6 @@
 <script>
     import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
 
     export default {
         props: {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DatesTable.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DatesTable.vue
index 25c8417d..ddedcd3d 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DatesTable.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DatesTable.vue
@@ -102,7 +102,7 @@
 
 <script>
     import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
     import ServicesIncluded from './ServicesListIncluded.vue'
 
     export default {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/EventPriceTable.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/EventPriceTable.vue
index 7145bf2c..2896c2c0 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/EventPriceTable.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/EventPriceTable.vue
@@ -25,7 +25,7 @@
     import Vue from 'vue'
     import $ from 'jquery'
     import AjaxContent from './AjaxContent.vue'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
 
     export default {
         components: {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/PriceTable.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/PriceTable.vue
index 25385273..b8deca02 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/PriceTable.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/PriceTable.vue
@@ -104,7 +104,7 @@
     import ServicesIncluded from './ServicesListIncluded.vue'
     import ServicesOptional from './ServicesListOptional.vue'
     import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
 
     export default {
         components: {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
index 4879ecba..8f733a3b 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue
@@ -1,7 +1,7 @@
 <script>
     import Vue from 'vue'
     import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
     import DatesTable from './DatesTable.vue'
     import PriceTable from './PriceTable.vue'
     import ServicesIncluded from './ServicesListIncluded.vue'
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResult.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResult.vue
index 604666e8..73c6a992 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResult.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/SearchResult.vue
@@ -1,7 +1,7 @@
 <script>
     import Vue from 'vue';
     import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
     import DaterangeSelect from './DaterangeSelect.vue'
     import DestinationCheckboxes from './DestinationCheckboxes.vue'
     import DestinationAutocomplete from './DestinationAutocomplete.vue'
@@ -17,7 +17,7 @@
     import dayjs from 'dayjs'
     import 'dayjs/locale/de'
 
-    import defaultFilterSettings from '../filtersettings'
+    import defaultFilterSettings from '../_filtersettings'
 
     export default {
         components: {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Watchlist.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Watchlist.vue
index 4d99aa8b..79d0da4f 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Watchlist.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Watchlist.vue
@@ -22,7 +22,7 @@
 
 <script>
     import Vue from 'vue'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
     import SearchResultItem from './SearchResultItem.vue'
 
     export default {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/WatchlistToggle.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/WatchlistToggle.vue
index 2d9e18b8..e7e281ae 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/WatchlistToggle.vue
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/WatchlistToggle.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
 
     export default {
         props: {
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js
index 5748f858..5fb3e2ed 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js
@@ -1,10 +1,13 @@
 'use strict';
 
 // Main app
-require('./app');
+require('./_app');
 
 // Main and vendor styles
-require('./styles');
+require('./_styles');
 
-// Brand specific styles
+// Main and vendor images
+require('./_images');
+
+// Main styles
 require('../scss/main.scss');
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js
index 47ad8f7b..1f72ae8e 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // Main app
-require('./app');
+require('./_app');
 
 // Main and vendor styles
-require('./styles');
+require('./_styles');
 
 // Brand specific styles
 require('../scss/main_snowzone.scss');
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js
index d764b6cb..fc45ff8c 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js
@@ -1,10 +1,10 @@
 'use strict';
 
 // Main app
-require('./app');
+require('./_app');
 
 // Main and vendor styles
-require('./styles');
+require('./_styles');
 
 // Brand specific styles
 require('../scss/main_unichamp.scss');
diff --git a/webpack.config.js b/webpack.config.js
index b07f7e02..b587b0a9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -11,7 +11,8 @@ Encore
     .addEntry('unichamp', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js')
     .addStyleEntry('rte', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/css/rte.css')
     .createSharedEntry('vendor', [
-        'jquery', 'vue', 'bootstrap-sass/assets/javascripts/bootstrap', 'slick-carousel',
+        'jquery', 'vue', 'vue-session', '@fengyuanchen/datepicker', 'jquery-lazy',
+        'bootstrap-sass/assets/javascripts/bootstrap', 'slick-carousel',
         'dayjs', 'cookieconsent', 'picturefill', '@fancyapps/fancybox', 'leaflet'
     ])
     .enableSassLoader()