diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index bddf1af1a..f1fc3d9c8 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -3,8 +3,16 @@ module.exports = {
 		'wikimedia',
 		'plugin:vue/vue3-essential',
 		'eslint:recommended',
-		'@vue/eslint-config-typescript'
+		'@vue/eslint-config-typescript',
+		'plugin:import/recommended',
+		'plugin:import/typescript'
 	],
+	'settings': {
+		'import/resolver': {
+			typescript: true,
+			node: true
+		}
+	},
 	'parserOptions': {
 		ecmaVersion: 'latest',
 		parser: '@typescript-eslint/parser'
@@ -98,7 +106,25 @@ module.exports = {
 				format: [ 'camelCase' ],
 				leadingUnderscore: 'forbid'
 			}
-		]
+		],
+		'sort-imports': [ 'error', {
+			ignoreCase: true,
+			ignoreDeclarationSort: true
+		} ],
+		'import/order': [ 1, {
+			groups: [ 'external', 'builtin', 'internal', 'sibling', 'parent', 'index' ],
+			pathGroups: [
+				{ pattern: '@src/createVueApp', group: 'external' },
+				{ pattern: '@banners/*', group: 'internal' },
+				{ pattern: '@src/*', group: 'internal' },
+				{ pattern: '@test/*', group: 'internal' },
+				{ pattern: '@environment/**', group: 'internal' }
+			],
+			alphabetize: {
+				order: 'asc',
+				caseInsensitive: true
+			}
+		} ]
 	},
 	'overrides': [
 		{
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_00/banner_ctrl.ts
index 157314205..840fd92f9 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_00/banner_var.ts
index 73c0d83df..2021bbd47 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/components/BannerCtrl.vue
index add3da97f..b8cb63a24 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/components/BannerCtrl.vue
@@ -83,35 +83,35 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import AlreadyDonatedContent from '../content/AlreadyDonatedContent.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
+import ProgressBar from '@src/components/ProgressBar/DoubleProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import ProgressBar from '@src/components/ProgressBar/DoubleProgressBar.vue';
-import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue';
-import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import AlreadyDonatedContent from '../content/AlreadyDonatedContent.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/components/BannerVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/components/BannerVar.vue
index 71f9ce1e1..975ed74cb 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/components/BannerVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/components/BannerVar.vue
@@ -97,41 +97,41 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import AlreadyDonatedContent from '../content/AlreadyDonatedContent.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
+import ChevronDownIcon from '@src/components/Icons/ChevronDownIcon.vue';
+import ProgressBar from '@src/components/ProgressBar/DoubleProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import ProgressBar from '@src/components/ProgressBar/DoubleProgressBar.vue';
-import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue';
 import { Tracker } from '@src/tracking/Tracker';
-import ChevronDownIcon from '@src/components/Icons/ChevronDownIcon.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
 import MinimisedBanner from './MinimisedBanner.vue';
-import { BannerMinimisedEvent } from '../events/BannerMinimisedEvent';
+import AlreadyDonatedContent from '../content/AlreadyDonatedContent.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 import { BannerMaximisedEvent } from '../events/BannerMaximisedEvent';
-import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { BannerMinimisedEvent } from '../events/BannerMinimisedEvent';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/components/FallbackBanner.vue
index 3a0ba5fe7..77f5c020f 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/components/FallbackBanner.vue
@@ -52,26 +52,26 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/components/MinimisedBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/components/MinimisedBanner.vue
index 38113d8e5..aede981d5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/components/MinimisedBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/components/MinimisedBanner.vue
@@ -22,8 +22,8 @@
 </template>
 
 <script setup lang="ts">
-import MinimisedText from '../content/MinimisedText.vue';
 import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import ChevronDownIcon from '@src/components/Icons/ChevronDownIcon.vue';
+import MinimisedText from '../content/MinimisedText.vue';
 defineEmits( [ 'close', 'maximise', 'maximise-cta' ] );
 </script>
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/content/BannerSlides.vue
index 84fc90e15..647efe8cc 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/content/BannerSlides.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/content/BannerText.vue
index bddb6ac63..e91792571 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/content/BannerText.vue
@@ -20,10 +20,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/content/FallbackSlides.vue
index 2a7307b9c..f50b852b0 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/content/FallbackSlides.vue
@@ -21,9 +21,9 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/content/FallbackText.vue
index 5cdd4f9d3..3f4ba0fb5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/content/FallbackText.vue
@@ -14,9 +14,9 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/content/MinimisedText.vue b/banners/desktop/C24_WMDE_Desktop_DE_00/content/MinimisedText.vue
index 2fe8127ea..627edcbb4 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/content/MinimisedText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/content/MinimisedText.vue
@@ -9,10 +9,10 @@
 	</div>
 </template>
 <script setup lang="ts">
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	getCurrentDateAndTime
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_00/event_map.ts
index 12e76b0b3..596086791 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/event_map.ts
@@ -1,21 +1,21 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
-import { BannerMinimisedEvent } from './events/BannerMinimisedEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 import { BannerMaximisedEvent } from './events/BannerMaximisedEvent';
+import { BannerMinimisedEvent } from './events/BannerMinimisedEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_00/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_00/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_00/messages.ts
index def0da998..6cc1b4a59 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_00/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_00/messages.ts
@@ -1,14 +1,14 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import UpgradeToMonthlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToMonthly.de';
-import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import UpgradeToMonthlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToMonthly.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
+import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_01/banner_ctrl.ts
index 8815d8ff8..27a3b2d29 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_01/banner_var.ts
index ea8aa628e..a61ce040e 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_01/components/BannerCtrl.vue
index b789569e7..820ae2a25 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/components/BannerCtrl.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_01/components/FallbackBanner.vue
index 07926bdb4..82e59d1a3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_01/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_01/content/BannerSlides.vue
index 2ebd857bb..bc1d354a6 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/content/BannerSlides.vue
@@ -29,11 +29,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_01/content/BannerText.vue
index 2993a39c2..aa231d169 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/content/BannerText.vue
@@ -20,9 +20,9 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_01/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_01/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_01/event_map.ts
index 81a4463ee..0300d13a6 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/event_map.ts
@@ -1,19 +1,19 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_01/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_01/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_01/messages.ts
index def0da998..6cc1b4a59 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_01/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_01/messages.ts
@@ -1,14 +1,14 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import UpgradeToMonthlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToMonthly.de';
-import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import UpgradeToMonthlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToMonthly.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
+import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_02/banner_ctrl.ts
index 157314205..840fd92f9 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_02/banner_var.ts
index 790f5e4c4..c4283b14d 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { currentCampaignTimePercentage } from './currentCampaignTimePercentage';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/components/BannerCtrl.vue
index b789569e7..820ae2a25 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/components/BannerCtrl.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/components/BannerVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/components/BannerVar.vue
index 8d1f013a9..d93316e08 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/components/BannerVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/components/BannerVar.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerTextVar.vue';
-import BannerSlides from '../content/BannerSlidesVar.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlidesVar.vue';
+import BannerText from '../content/BannerTextVar.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/components/FallbackBanner.vue
index 07926bdb4..82e59d1a3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerSlides.vue
index 00be0d956..60f73a5e4 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerSlides.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerSlidesVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerSlidesVar.vue
index b40339e37..b8caf8aac 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerSlidesVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerSlidesVar.vue
@@ -33,12 +33,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerText.vue
index 8b92eaea9..cb918b9c3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerText.vue
@@ -21,10 +21,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerTextVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerTextVar.vue
index 2a2326de5..cced407f5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerTextVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/content/BannerTextVar.vue
@@ -24,10 +24,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_02/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_02/event_map.ts
index 81a4463ee..0300d13a6 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/event_map.ts
@@ -1,19 +1,19 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_02/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_02/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_02/messages.ts
index def0da998..6cc1b4a59 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_02/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_02/messages.ts
@@ -1,14 +1,14 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import UpgradeToMonthlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToMonthly.de';
-import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import UpgradeToMonthlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToMonthly.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
+import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_03/banner_ctrl.ts
index 6e6f9870f..99d760658 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/banner_ctrl.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_03/banner_var.ts
index b69418994..a5b629b23 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/banner_var.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/stylesVar.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_03/components/BannerCtrl.vue
index b789569e7..820ae2a25 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/components/BannerCtrl.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_03/components/FallbackBanner.vue
index 07926bdb4..82e59d1a3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_03/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_03/content/BannerSlides.vue
index 00be0d956..60f73a5e4 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/content/BannerSlides.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_03/content/BannerText.vue
index 8b92eaea9..cb918b9c3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/content/BannerText.vue
@@ -21,10 +21,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_03/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_03/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_03/event_map.ts
index 81a4463ee..0300d13a6 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/event_map.ts
@@ -1,19 +1,19 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_03/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_03/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_03/messages.ts
index b72ef24e3..c051c6b78 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_03/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_03/messages.ts
@@ -1,11 +1,11 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_04/banner_ctrl.ts
index cb264ec02..dd65c2320 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/banner_ctrl.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_04/banner_var.ts
index d67574189..6b39eb069 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/banner_var.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_04/components/BannerCtrl.vue
index b789569e7..820ae2a25 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/components/BannerCtrl.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_04/components/FallbackBanner.vue
index 07926bdb4..82e59d1a3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_04/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_04/content/BannerSlides.vue
index 00be0d956..60f73a5e4 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/content/BannerSlides.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_04/content/BannerText.vue
index 8b92eaea9..cb918b9c3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/content/BannerText.vue
@@ -21,10 +21,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_04/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_04/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_04/event_map.ts
index 81a4463ee..0300d13a6 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/event_map.ts
@@ -1,19 +1,19 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_04/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_04/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_04/messages.ts
index b72ef24e3..c051c6b78 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_04/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_04/messages.ts
@@ -1,11 +1,11 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_05/banner_ctrl.ts
index 510434589..401a7c952 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/banner_ctrl.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_05/banner_var.ts
index 9ccbc34d5..8df77eaff 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/banner_var.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_05/components/BannerCtrl.vue
index b789569e7..820ae2a25 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/components/BannerCtrl.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/components/BannerVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_05/components/BannerVar.vue
index 6fb3e438c..b00aeeb5f 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/components/BannerVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/components/BannerVar.vue
@@ -56,32 +56,32 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormAction } from '@src/components/composables/useAmountBasedFormAction';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormAction } from '@src/components/composables/useAmountBasedFormAction';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { FormActions } from '@src/domain/FormActions';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import { FormActions } from '@src/domain/FormActions';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_05/components/FallbackBanner.vue
index 07926bdb4..82e59d1a3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_05/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_05/content/BannerSlides.vue
index 00be0d956..60f73a5e4 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/content/BannerSlides.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_05/content/BannerText.vue
index 8b92eaea9..cb918b9c3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/content/BannerText.vue
@@ -21,10 +21,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_05/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_05/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_05/event_map.ts
index 81a4463ee..0300d13a6 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/event_map.ts
@@ -1,19 +1,19 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_05/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_05/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_05/messages.ts
index b72ef24e3..c051c6b78 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_05/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_05/messages.ts
@@ -1,11 +1,11 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_06/banner_ctrl.ts
index 510434589..401a7c952 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/banner_ctrl.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_06/banner_var.ts
index 50c379d37..61f6fe168 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFAQPageURL } from '@src/createFAQPageURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { createFAQPageURL } from '@src/createFAQPageURL';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerCtrl.vue
index b789569e7..820ae2a25 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerCtrl.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerVar.vue
index 32d6d74da..1cf4a6845 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerVar.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import SmallPrintFooter from '@src/components/Footer/SmallPrintFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import SmallPrintFooter from '@src/components/Footer/SmallPrintFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_06/components/FallbackBanner.vue
index 07926bdb4..82e59d1a3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_06/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_06/content/BannerSlides.vue
index 00be0d956..60f73a5e4 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/content/BannerSlides.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_06/content/BannerText.vue
index 8b92eaea9..cb918b9c3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/content/BannerText.vue
@@ -21,10 +21,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_06/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_06/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_06/event_map.ts
index 81a4463ee..0300d13a6 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/event_map.ts
@@ -1,19 +1,19 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_06/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_06/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_06/messages.ts
index b72ef24e3..c051c6b78 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_06/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_06/messages.ts
@@ -1,11 +1,11 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_07/banner_ctrl.ts
index 510434589..401a7c952 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/banner_ctrl.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_07/banner_var.ts
index efc3e2a79..6952f2c54 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/banner_var.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
 import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/components/BannerCtrl.vue
index b789569e7..820ae2a25 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/components/BannerCtrl.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/components/BannerVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/components/BannerVar.vue
index 8d1f013a9..d93316e08 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/components/BannerVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/components/BannerVar.vue
@@ -56,30 +56,30 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerTextVar.vue';
-import BannerSlides from '../content/BannerSlidesVar.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlidesVar.vue';
+import BannerText from '../content/BannerTextVar.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/components/FallbackBanner.vue
index 07926bdb4..82e59d1a3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerSlides.vue
index 48bf77be7..32323aacf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerSlides.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerSlidesVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerSlidesVar.vue
index 0472cf260..4226c1093 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerSlidesVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerSlidesVar.vue
@@ -33,12 +33,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerText.vue
index df1136b63..44c7e2808 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerText.vue
@@ -21,10 +21,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerTextVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerTextVar.vue
index 22a740c99..0cfccfa7a 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerTextVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/content/BannerTextVar.vue
@@ -24,10 +24,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_07/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_07/event_map.ts
index 81a4463ee..0300d13a6 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/event_map.ts
@@ -1,19 +1,19 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_07/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_07/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_07/messages.ts
index b72ef24e3..c051c6b78 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_07/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_07/messages.ts
@@ -1,11 +1,11 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_08/banner_ctrl.ts
index c0b50d8ba..bc571045e 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
 import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
-import messages from './messages';
 import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_08/banner_var.ts
index e45ec70f5..2b15f95ab 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
 import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
-import messages from './messages_var';
 import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages_var';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerCtrl.vue
index c826ccf4b..eb6fc271b 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerCtrl.vue
@@ -67,34 +67,34 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerVar.vue
index deb24ea8f..dd89a7efa 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerVar.vue
@@ -76,35 +76,35 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_08/components/FallbackBanner.vue
index 6550131fa..178902353 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/components/FallbackBanner.vue
@@ -52,26 +52,26 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_08/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_08/content/BannerSlides.vue
index 46790f372..e1103ec2d 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/content/BannerSlides.vue
@@ -34,12 +34,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_08/content/BannerText.vue
index c004e00e4..54087056d 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/content/BannerText.vue
@@ -26,10 +26,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_08/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_08/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_08/event_map.ts
index 88eb4714e..730af7701 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/event_map.ts
@@ -1,20 +1,20 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
+import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
-import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_08/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_08/messages.ts
index 8bab843a2..9a6153df1 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/messages.ts
@@ -1,12 +1,12 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_08/messages_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_08/messages_var.ts
index c82c43ff5..de169f71f 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_08/messages_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_08/messages_var.ts
@@ -1,13 +1,13 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
 import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_09/banner_ctrl.ts
index c0b50d8ba..bc571045e 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
 import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
-import messages from './messages';
 import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_09/banner_var.ts
index 539890a80..e766bc888 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
 import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
-import messages from './messages';
 import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerCtrl.vue
index 3db33caba..271132457 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerCtrl.vue
@@ -76,35 +76,35 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerVar.vue
index 906badc81..ccf056959 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerVar.vue
@@ -76,35 +76,35 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerTextVar.vue';
-import BannerSlides from '../content/BannerSlidesVar.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlidesVar.vue';
+import BannerText from '../content/BannerTextVar.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/components/FallbackBanner.vue
index 6550131fa..178902353 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/components/FallbackBanner.vue
@@ -52,26 +52,26 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerSlides.vue
index 46790f372..e1103ec2d 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerSlides.vue
@@ -34,12 +34,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerSlidesVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerSlidesVar.vue
index 9bea7218f..3bbe74ee7 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerSlidesVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerSlidesVar.vue
@@ -36,12 +36,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerText.vue
index c004e00e4..54087056d 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerText.vue
@@ -26,10 +26,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerTextVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerTextVar.vue
index b4a09fa4a..ae4b1f0e8 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerTextVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/content/BannerTextVar.vue
@@ -24,10 +24,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_09/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_09/event_map.ts
index 88eb4714e..730af7701 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/event_map.ts
@@ -1,20 +1,20 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
+import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
-import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_09/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_09/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_09/messages.ts
index c82c43ff5..de169f71f 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_09/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_09/messages.ts
@@ -1,13 +1,13 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
 import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/banner_ctrl.ts b/banners/desktop/C24_WMDE_Desktop_DE_10/banner_ctrl.ts
index c0b50d8ba..bc571045e 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/banner_ctrl.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
 import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
-import messages from './messages';
 import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/banner_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_10/banner_var.ts
index 754f31a78..b19d20ace 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/banner_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
 import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
-import messages from './messages';
 import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { createFormItems } from './form_items_var';
-import { createFormActions } from '@src/createFormActions';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items_var';
+import messages from './messages';
 
 const date = new Date();
 const localeFactory = new LocaleFactoryDe();
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerCtrl.vue b/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerCtrl.vue
index 3db33caba..271132457 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerCtrl.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerCtrl.vue
@@ -76,35 +76,35 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerVar.vue b/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerVar.vue
index 3db33caba..271132457 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerVar.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerVar.vue
@@ -76,35 +76,35 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/components/FallbackBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_10/components/FallbackBanner.vue
index 6550131fa..178902353 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/components/FallbackBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/components/FallbackBanner.vue
@@ -52,26 +52,26 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/components/MainBanner.vue b/banners/desktop/C24_WMDE_Desktop_DE_10/components/MainBanner.vue
index ab097bf67..685b6b564 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/components/MainBanner.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/components/MainBanner.vue
@@ -17,9 +17,9 @@ tart<template>
 
 <script setup lang="ts">
 
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/content/BannerSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_10/content/BannerSlides.vue
index 46790f372..e1103ec2d 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/content/BannerSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/content/BannerSlides.vue
@@ -34,12 +34,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/content/BannerText.vue b/banners/desktop/C24_WMDE_Desktop_DE_10/content/BannerText.vue
index c004e00e4..54087056d 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/content/BannerText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/content/BannerText.vue
@@ -26,10 +26,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/content/FallbackSlides.vue b/banners/desktop/C24_WMDE_Desktop_DE_10/content/FallbackSlides.vue
index b5e4af29d..bd54880bf 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/content/FallbackSlides.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/content/FallbackText.vue b/banners/desktop/C24_WMDE_Desktop_DE_10/content/FallbackText.vue
index 5c14762e7..24c6a90b5 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/content/FallbackText.vue
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/content/FallbackText.vue
@@ -15,8 +15,8 @@
 
 <script setup lang="ts">
 import { inject } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	campaignDaySentence
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/event_map.ts b/banners/desktop/C24_WMDE_Desktop_DE_10/event_map.ts
index 88eb4714e..730af7701 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/event_map.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/event_map.ts
@@ -1,20 +1,20 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
+import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
-import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/form_items.ts b/banners/desktop/C24_WMDE_Desktop_DE_10/form_items.ts
index b70650d19..0d03255b3 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/form_items.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/form_items_var.ts b/banners/desktop/C24_WMDE_Desktop_DE_10/form_items_var.ts
index cdd99a20b..45e1ff4ad 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/form_items_var.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/form_items_var.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/desktop/C24_WMDE_Desktop_DE_10/messages.ts b/banners/desktop/C24_WMDE_Desktop_DE_10/messages.ts
index 0afbded48..bc2c4fdbc 100644
--- a/banners/desktop/C24_WMDE_Desktop_DE_10/messages.ts
+++ b/banners/desktop/C24_WMDE_Desktop_DE_10/messages.ts
@@ -1,13 +1,13 @@
-import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
 import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import FooterDe from '@src/components/Footer/messages/Footer.de';
+import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
 import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import FooterDe from '@src/components/Footer/messages/Footer.de';
 import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/banner_ctrl.ts b/banners/english/C24_WMDE_Desktop_EN_00/banner_ctrl.ts
index 5ac47a488..caeb588cc 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/banner_ctrl.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_00/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/banner_var.ts b/banners/english/C24_WMDE_Desktop_EN_00/banner_var.ts
index 3ea0eb145..4d45905fb 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/banner_var.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_00/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/components/BannerCtrl.vue b/banners/english/C24_WMDE_Desktop_EN_00/components/BannerCtrl.vue
index 6540c847b..b76923cff 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/components/BannerCtrl.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_00/components/BannerCtrl.vue
@@ -82,34 +82,34 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/components/BannerVar.vue b/banners/english/C24_WMDE_Desktop_EN_00/components/BannerVar.vue
index b2ae7e2c5..9c7bacb47 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/components/BannerVar.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_00/components/BannerVar.vue
@@ -82,35 +82,35 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/components/FallbackBanner.vue b/banners/english/C24_WMDE_Desktop_EN_00/components/FallbackBanner.vue
index d23a626a6..ccd30e303 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/components/FallbackBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_00/components/FallbackBanner.vue
@@ -52,26 +52,26 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/components/MainBanner.vue b/banners/english/C24_WMDE_Desktop_EN_00/components/MainBanner.vue
index 9f9ebe572..57b27a0dd 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/components/MainBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_00/components/MainBanner.vue
@@ -19,10 +19,10 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/content/BannerSlides.vue b/banners/english/C24_WMDE_Desktop_EN_00/content/BannerSlides.vue
index 75d126e61..ad52eca74 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/content/BannerSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_00/content/BannerSlides.vue
@@ -37,12 +37,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/content/BannerText.vue b/banners/english/C24_WMDE_Desktop_EN_00/content/BannerText.vue
index ef8b64f82..11e35e22d 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/content/BannerText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_00/content/BannerText.vue
@@ -33,10 +33,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const { currentDayName, currentDate, getCurrentDateAndTime }: DynamicContent = inject( 'dynamicCampaignText' );
 const { liveDateAndTime, startTimer, stopTimer } = useLiveDateAndTime( getCurrentDateAndTime );
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/content/FallbackSlides.vue b/banners/english/C24_WMDE_Desktop_EN_00/content/FallbackSlides.vue
index 164002d50..b8ba8c382 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/content/FallbackSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_00/content/FallbackSlides.vue
@@ -21,9 +21,9 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/content/FallbackText.vue b/banners/english/C24_WMDE_Desktop_EN_00/content/FallbackText.vue
index 60a58e80d..300234ff0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/content/FallbackText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_00/content/FallbackText.vue
@@ -16,9 +16,9 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/event_map.ts b/banners/english/C24_WMDE_Desktop_EN_00/event_map.ts
index 612f999a8..f243f5460 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/event_map.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_00/event_map.ts
@@ -1,18 +1,18 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/form_items.ts b/banners/english/C24_WMDE_Desktop_EN_00/form_items.ts
index 95a254ccb..770c71cd0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/form_items.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_00/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/english/C24_WMDE_Desktop_EN_00/messages.ts b/banners/english/C24_WMDE_Desktop_EN_00/messages.ts
index d7277d676..b09f52b6b 100644
--- a/banners/english/C24_WMDE_Desktop_EN_00/messages.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_00/messages.ts
@@ -1,13 +1,13 @@
-import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
-import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
-import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
 import AddressFormEn from '@src/components/DonationForm/Forms/messages/AddressForm.en';
-import FooterEn from '@src/components/Footer/messages/Footer.en';
+import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
 import MainDonationFormEn from '@src/components/DonationForm/Forms/messages/MainDonationForm.en';
-import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
+import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.en';
+import FooterEn from '@src/components/Footer/messages/Footer.en';
+import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormEn,
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/banner_ctrl.ts b/banners/english/C24_WMDE_Desktop_EN_01/banner_ctrl.ts
index 1e244476a..3a567e0bd 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/banner_ctrl.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_01/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/banner_var.ts b/banners/english/C24_WMDE_Desktop_EN_01/banner_var.ts
index 9dd0bb243..9844f2f85 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/banner_var.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_01/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/components/BannerCtrl.vue b/banners/english/C24_WMDE_Desktop_EN_01/components/BannerCtrl.vue
index 62ebb8e96..eb1bd2b9d 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/components/BannerCtrl.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_01/components/BannerCtrl.vue
@@ -70,32 +70,32 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/components/BannerVar.vue b/banners/english/C24_WMDE_Desktop_EN_01/components/BannerVar.vue
index b2ae7e2c5..9c7bacb47 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/components/BannerVar.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_01/components/BannerVar.vue
@@ -82,35 +82,35 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/components/FallbackBanner.vue b/banners/english/C24_WMDE_Desktop_EN_01/components/FallbackBanner.vue
index 75e469475..14b812afb 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/components/FallbackBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_01/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/components/MainBanner.vue b/banners/english/C24_WMDE_Desktop_EN_01/components/MainBanner.vue
index 9f9ebe572..57b27a0dd 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/components/MainBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_01/components/MainBanner.vue
@@ -19,10 +19,10 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/content/BannerSlides.vue b/banners/english/C24_WMDE_Desktop_EN_01/content/BannerSlides.vue
index 75d126e61..ad52eca74 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/content/BannerSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_01/content/BannerSlides.vue
@@ -37,12 +37,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/content/BannerText.vue b/banners/english/C24_WMDE_Desktop_EN_01/content/BannerText.vue
index ef8b64f82..11e35e22d 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/content/BannerText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_01/content/BannerText.vue
@@ -33,10 +33,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const { currentDayName, currentDate, getCurrentDateAndTime }: DynamicContent = inject( 'dynamicCampaignText' );
 const { liveDateAndTime, startTimer, stopTimer } = useLiveDateAndTime( getCurrentDateAndTime );
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/content/FallbackSlides.vue b/banners/english/C24_WMDE_Desktop_EN_01/content/FallbackSlides.vue
index a50a81082..b83134805 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/content/FallbackSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_01/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/content/FallbackText.vue b/banners/english/C24_WMDE_Desktop_EN_01/content/FallbackText.vue
index 60a58e80d..300234ff0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/content/FallbackText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_01/content/FallbackText.vue
@@ -16,9 +16,9 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/event_map.ts b/banners/english/C24_WMDE_Desktop_EN_01/event_map.ts
index 612f999a8..f243f5460 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/event_map.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_01/event_map.ts
@@ -1,18 +1,18 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/form_items.ts b/banners/english/C24_WMDE_Desktop_EN_01/form_items.ts
index 95a254ccb..770c71cd0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/form_items.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_01/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/english/C24_WMDE_Desktop_EN_01/messages.ts b/banners/english/C24_WMDE_Desktop_EN_01/messages.ts
index d7277d676..b09f52b6b 100644
--- a/banners/english/C24_WMDE_Desktop_EN_01/messages.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_01/messages.ts
@@ -1,13 +1,13 @@
-import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
-import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
-import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
 import AddressFormEn from '@src/components/DonationForm/Forms/messages/AddressForm.en';
-import FooterEn from '@src/components/Footer/messages/Footer.en';
+import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
 import MainDonationFormEn from '@src/components/DonationForm/Forms/messages/MainDonationForm.en';
-import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
+import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.en';
+import FooterEn from '@src/components/Footer/messages/Footer.en';
+import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormEn,
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/banner_ctrl.ts b/banners/english/C24_WMDE_Desktop_EN_02/banner_ctrl.ts
index 1e244476a..3a567e0bd 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/banner_ctrl.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/banner_var.ts b/banners/english/C24_WMDE_Desktop_EN_02/banner_var.ts
index f655c9fb7..913c27cf0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/banner_var.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/components/BannerCtrl.vue b/banners/english/C24_WMDE_Desktop_EN_02/components/BannerCtrl.vue
index 62ebb8e96..eb1bd2b9d 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/components/BannerCtrl.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/components/BannerCtrl.vue
@@ -70,32 +70,32 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/components/BannerVar.vue b/banners/english/C24_WMDE_Desktop_EN_02/components/BannerVar.vue
index 7405002dc..59301cdb9 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/components/BannerVar.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/components/BannerVar.vue
@@ -70,32 +70,32 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides_var.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText_var.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides_var.vue';
+import BannerText from '../content/BannerText_var.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/components/FallbackBanner.vue b/banners/english/C24_WMDE_Desktop_EN_02/components/FallbackBanner.vue
index 75e469475..14b812afb 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/components/FallbackBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/components/MainBanner.vue b/banners/english/C24_WMDE_Desktop_EN_02/components/MainBanner.vue
index 9f9ebe572..57b27a0dd 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/components/MainBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/components/MainBanner.vue
@@ -19,10 +19,10 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/content/BannerSlides.vue b/banners/english/C24_WMDE_Desktop_EN_02/content/BannerSlides.vue
index 75d126e61..ad52eca74 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/content/BannerSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/content/BannerSlides.vue
@@ -37,12 +37,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/content/BannerSlides_var.vue b/banners/english/C24_WMDE_Desktop_EN_02/content/BannerSlides_var.vue
index 45dafe6aa..bf27017ce 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/content/BannerSlides_var.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/content/BannerSlides_var.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/content/BannerText.vue b/banners/english/C24_WMDE_Desktop_EN_02/content/BannerText.vue
index ef8b64f82..11e35e22d 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/content/BannerText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/content/BannerText.vue
@@ -33,10 +33,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const { currentDayName, currentDate, getCurrentDateAndTime }: DynamicContent = inject( 'dynamicCampaignText' );
 const { liveDateAndTime, startTimer, stopTimer } = useLiveDateAndTime( getCurrentDateAndTime );
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/content/BannerText_var.vue b/banners/english/C24_WMDE_Desktop_EN_02/content/BannerText_var.vue
index 8076e2468..ef0ae53ab 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/content/BannerText_var.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/content/BannerText_var.vue
@@ -31,10 +31,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const { currentDayName, currentDate, getCurrentDateAndTime }: DynamicContent = inject( 'dynamicCampaignText' );
 const { liveDateAndTime, startTimer, stopTimer } = useLiveDateAndTime( getCurrentDateAndTime );
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/content/FallbackSlides.vue b/banners/english/C24_WMDE_Desktop_EN_02/content/FallbackSlides.vue
index a50a81082..b83134805 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/content/FallbackSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/content/FallbackText.vue b/banners/english/C24_WMDE_Desktop_EN_02/content/FallbackText.vue
index 60a58e80d..300234ff0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/content/FallbackText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02/content/FallbackText.vue
@@ -16,9 +16,9 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/event_map.ts b/banners/english/C24_WMDE_Desktop_EN_02/event_map.ts
index 612f999a8..f243f5460 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/event_map.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02/event_map.ts
@@ -1,18 +1,18 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/form_items.ts b/banners/english/C24_WMDE_Desktop_EN_02/form_items.ts
index 95a254ccb..770c71cd0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/form_items.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/english/C24_WMDE_Desktop_EN_02/messages.ts b/banners/english/C24_WMDE_Desktop_EN_02/messages.ts
index d7277d676..b09f52b6b 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02/messages.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02/messages.ts
@@ -1,13 +1,13 @@
-import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
-import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
-import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
 import AddressFormEn from '@src/components/DonationForm/Forms/messages/AddressForm.en';
-import FooterEn from '@src/components/Footer/messages/Footer.en';
+import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
 import MainDonationFormEn from '@src/components/DonationForm/Forms/messages/MainDonationForm.en';
-import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
+import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.en';
+import FooterEn from '@src/components/Footer/messages/Footer.en';
+import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormEn,
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/banner_ctrl.ts b/banners/english/C24_WMDE_Desktop_EN_02b/banner_ctrl.ts
index 1e244476a..3a567e0bd 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/banner_ctrl.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/banner_var.ts b/banners/english/C24_WMDE_Desktop_EN_02b/banner_var.ts
index f655c9fb7..913c27cf0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/banner_var.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerCtrl.vue b/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerCtrl.vue
index 343684d19..1688db1be 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerCtrl.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerCtrl.vue
@@ -83,34 +83,34 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerVar.vue b/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerVar.vue
index d4edcc1d0..85471ac44 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerVar.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerVar.vue
@@ -83,34 +83,34 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides_var.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText_var.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides_var.vue';
+import BannerText from '../content/BannerText_var.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/components/FallbackBanner.vue b/banners/english/C24_WMDE_Desktop_EN_02b/components/FallbackBanner.vue
index 75e469475..14b812afb 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/components/FallbackBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/components/MainBanner.vue b/banners/english/C24_WMDE_Desktop_EN_02b/components/MainBanner.vue
index 9f9ebe572..57b27a0dd 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/components/MainBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/components/MainBanner.vue
@@ -19,10 +19,10 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerSlides.vue b/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerSlides.vue
index 75d126e61..ad52eca74 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerSlides.vue
@@ -37,12 +37,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerSlides_var.vue b/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerSlides_var.vue
index 45dafe6aa..bf27017ce 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerSlides_var.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerSlides_var.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerText.vue b/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerText.vue
index ef8b64f82..11e35e22d 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerText.vue
@@ -33,10 +33,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const { currentDayName, currentDate, getCurrentDateAndTime }: DynamicContent = inject( 'dynamicCampaignText' );
 const { liveDateAndTime, startTimer, stopTimer } = useLiveDateAndTime( getCurrentDateAndTime );
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerText_var.vue b/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerText_var.vue
index 8076e2468..ef0ae53ab 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerText_var.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/content/BannerText_var.vue
@@ -31,10 +31,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const { currentDayName, currentDate, getCurrentDateAndTime }: DynamicContent = inject( 'dynamicCampaignText' );
 const { liveDateAndTime, startTimer, stopTimer } = useLiveDateAndTime( getCurrentDateAndTime );
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/content/FallbackSlides.vue b/banners/english/C24_WMDE_Desktop_EN_02b/content/FallbackSlides.vue
index a50a81082..b83134805 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/content/FallbackSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/content/FallbackText.vue b/banners/english/C24_WMDE_Desktop_EN_02b/content/FallbackText.vue
index 60a58e80d..300234ff0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/content/FallbackText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/content/FallbackText.vue
@@ -16,9 +16,9 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/event_map.ts b/banners/english/C24_WMDE_Desktop_EN_02b/event_map.ts
index 612f999a8..f243f5460 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/event_map.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/event_map.ts
@@ -1,18 +1,18 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/form_items.ts b/banners/english/C24_WMDE_Desktop_EN_02b/form_items.ts
index 95a254ccb..770c71cd0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/form_items.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/english/C24_WMDE_Desktop_EN_02b/messages.ts b/banners/english/C24_WMDE_Desktop_EN_02b/messages.ts
index 24d57a42d..43b26f7d7 100644
--- a/banners/english/C24_WMDE_Desktop_EN_02b/messages.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_02b/messages.ts
@@ -1,13 +1,13 @@
-import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
-import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
-import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
 import AddressFormEn from '@src/components/DonationForm/Forms/messages/AddressForm.en';
-import FooterEn from '@src/components/Footer/messages/Footer.en';
+import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
 import MainDonationFormEn from '@src/components/DonationForm/Forms/messages/MainDonationForm.en';
-import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
+import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.en';
+import FooterEn from '@src/components/Footer/messages/Footer.en';
+import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormEn,
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/banner_ctrl.ts b/banners/english/C24_WMDE_Desktop_EN_03/banner_ctrl.ts
index eaa6e8e8e..0c9535076 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/banner_ctrl.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_03/banner_ctrl.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/banner_var.ts b/banners/english/C24_WMDE_Desktop_EN_03/banner_var.ts
index 2c68c8e80..ddf8e557c 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/banner_var.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_03/banner_var.ts
@@ -3,27 +3,27 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import FallbackBanner from './components/FallbackBanner.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
-import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import { Locales } from '@src/domain/Locales';
-import messages from './messages';
 import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import eventMappings from './event_map_var';
-import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
 import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import FallbackBanner from './components/FallbackBanner.vue';
+import eventMappings from './event_map_var';
+import { createFormItems } from './form_items';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/components/BannerCtrl.vue b/banners/english/C24_WMDE_Desktop_EN_03/components/BannerCtrl.vue
index 9901f300f..5bb75cce7 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/components/BannerCtrl.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_03/components/BannerCtrl.vue
@@ -83,34 +83,34 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/components/BannerVar.vue b/banners/english/C24_WMDE_Desktop_EN_03/components/BannerVar.vue
index 11a6e1566..f7475fa5f 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/components/BannerVar.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_03/components/BannerVar.vue
@@ -84,36 +84,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationFormTransactionFees from '@src/components/DonationForm/Forms/MainDonationFormTransactionFees.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBarAlternative.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { CoverTransactionFeesEvent } from '@src/tracking/events/CoverTransactionFeesEvent';
 import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/components/FallbackBanner.vue b/banners/english/C24_WMDE_Desktop_EN_03/components/FallbackBanner.vue
index 75e469475..14b812afb 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/components/FallbackBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_03/components/FallbackBanner.vue
@@ -51,25 +51,25 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { computed, inject, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
+import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import FallbackText from '../content/FallbackText.vue';
-import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
-import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
-import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
 import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import FallbackSlides from '../content/FallbackSlides.vue';
+import FallbackText from '../content/FallbackText.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/components/MainBanner.vue b/banners/english/C24_WMDE_Desktop_EN_03/components/MainBanner.vue
index 9f9ebe572..57b27a0dd 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/components/MainBanner.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_03/components/MainBanner.vue
@@ -19,10 +19,10 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/content/BannerSlides.vue b/banners/english/C24_WMDE_Desktop_EN_03/content/BannerSlides.vue
index 45dafe6aa..bf27017ce 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/content/BannerSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_03/content/BannerSlides.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/content/BannerText.vue b/banners/english/C24_WMDE_Desktop_EN_03/content/BannerText.vue
index 8076e2468..ef0ae53ab 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/content/BannerText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_03/content/BannerText.vue
@@ -31,10 +31,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const { currentDayName, currentDate, getCurrentDateAndTime }: DynamicContent = inject( 'dynamicCampaignText' );
 const { liveDateAndTime, startTimer, stopTimer } = useLiveDateAndTime( getCurrentDateAndTime );
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/content/FallbackSlides.vue b/banners/english/C24_WMDE_Desktop_EN_03/content/FallbackSlides.vue
index a50a81082..b83134805 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/content/FallbackSlides.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_03/content/FallbackSlides.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/content/FallbackText.vue b/banners/english/C24_WMDE_Desktop_EN_03/content/FallbackText.vue
index 60a58e80d..300234ff0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/content/FallbackText.vue
+++ b/banners/english/C24_WMDE_Desktop_EN_03/content/FallbackText.vue
@@ -16,9 +16,9 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/event_map.ts b/banners/english/C24_WMDE_Desktop_EN_03/event_map.ts
index 612f999a8..f243f5460 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/event_map.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_03/event_map.ts
@@ -1,18 +1,18 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/event_map_var.ts b/banners/english/C24_WMDE_Desktop_EN_03/event_map_var.ts
index 33d6fcf4d..41fee14cf 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/event_map_var.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_03/event_map_var.ts
@@ -1,19 +1,19 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CoverTransactionFeesEvent } from '@src/tracking/events/CoverTransactionFeesEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
-import { CoverTransactionFeesEvent } from '@src/tracking/events/CoverTransactionFeesEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ ShownEvent.EVENT_NAME, mapShownEvent ],
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/form_items.ts b/banners/english/C24_WMDE_Desktop_EN_03/form_items.ts
index 95a254ccb..770c71cd0 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/form_items.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_03/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/english/C24_WMDE_Desktop_EN_03/messages.ts b/banners/english/C24_WMDE_Desktop_EN_03/messages.ts
index 28077441b..70a273786 100644
--- a/banners/english/C24_WMDE_Desktop_EN_03/messages.ts
+++ b/banners/english/C24_WMDE_Desktop_EN_03/messages.ts
@@ -1,13 +1,13 @@
-import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
-import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
-import { TranslationMessages } from '@src/Translator';
-import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
-import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
 import AddressFormEn from '@src/components/DonationForm/Forms/messages/AddressForm.en';
-import FooterEn from '@src/components/Footer/messages/Footer.en';
+import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
 import MainDonationFormEn from '@src/components/DonationForm/Forms/messages/MainDonationForm.en';
-import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en';
+import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
 import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.en';
+import FooterEn from '@src/components/Footer/messages/Footer.en';
+import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormEn,
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/banner_ctrl.ts b/banners/mobile/C24_WMDE_Mobile_DE_00/banner_ctrl.ts
index c472f3ba3..96d602893 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/banner_ctrl.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/banner_ctrl.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/banner_var.ts b/banners/mobile/C24_WMDE_Mobile_DE_00/banner_var.ts
index 9d7181931..77dc0317e 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/banner_var.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/banner_var.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items_var';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/components/BannerCtrl.vue b/banners/mobile/C24_WMDE_Mobile_DE_00/components/BannerCtrl.vue
index 49cb852a9..d55d4481c 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/components/BannerCtrl.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/components/BannerCtrl.vue
@@ -102,40 +102,40 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import MainDonationFormPaymentMethodLabeledButton
 	from '@src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/components/BannerVar.vue b/banners/mobile/C24_WMDE_Mobile_DE_00/components/BannerVar.vue
index b6f70e229..87c844a9a 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/components/BannerVar.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/components/BannerVar.vue
@@ -121,45 +121,45 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBannerVar.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import MainDonationFormPaymentMethodLabeledButton
 	from '@src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import SmsIcon from '@src/components/Icons/SmsIcon.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
 import SepaLogo from '@src/components/PaymentLogos/SepaLogo.vue';
-import SmsIcon from '@src/components/Icons/SmsIcon.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBannerVar.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/components/MiniBannerVar.vue b/banners/mobile/C24_WMDE_Mobile_DE_00/components/MiniBannerVar.vue
index 92454cd0c..c09bd0d52 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/components/MiniBannerVar.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/components/MiniBannerVar.vue
@@ -40,11 +40,11 @@
 <script setup lang="ts">
 
 import CloseIconMobile from '@src/components/Icons/CloseIconMobile.vue';
-import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import SmsIcon from '@src/components/Icons/SmsIcon.vue';
+import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
 import SepaLogo from '@src/components/PaymentLogos/SepaLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
 
 defineEmits( [ 'showFullPageBanner', 'showFullPageBannerPreselected', 'close' ] );
 
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/content/BannerSlides.vue b/banners/mobile/C24_WMDE_Mobile_DE_00/content/BannerSlides.vue
index ffc10c1c8..dbc738f99 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/content/BannerSlides.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/content/BannerSlides.vue
@@ -40,12 +40,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/content/BannerText.vue b/banners/mobile/C24_WMDE_Mobile_DE_00/content/BannerText.vue
index 969c1cc04..b53a81086 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/content/BannerText.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/content/BannerText.vue
@@ -20,9 +20,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/event_map.ts b/banners/mobile/C24_WMDE_Mobile_DE_00/event_map.ts
index 7bb6ae360..182a12bef 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/event_map.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/event_map.ts
@@ -1,15 +1,15 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/form_items.ts b/banners/mobile/C24_WMDE_Mobile_DE_00/form_items.ts
index 53c204d06..41fccf31d 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/form_items.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/form_items_var.ts b/banners/mobile/C24_WMDE_Mobile_DE_00/form_items_var.ts
index a3afe2094..517aaf240 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/form_items_var.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/form_items_var.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_00/messages.ts b/banners/mobile/C24_WMDE_Mobile_DE_00/messages.ts
index 13815c5ec..3e8eaf03d 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_00/messages.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_00/messages.ts
@@ -1,11 +1,11 @@
+import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
-import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/banner_ctrl.ts b/banners/mobile/C24_WMDE_Mobile_DE_01/banner_ctrl.ts
index c472f3ba3..96d602893 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/banner_ctrl.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/banner_ctrl.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/banner_var.ts b/banners/mobile/C24_WMDE_Mobile_DE_01/banner_var.ts
index b6647dd3a..3319d5043 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/banner_var.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/banner_var.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/components/BannerCtrl.vue b/banners/mobile/C24_WMDE_Mobile_DE_01/components/BannerCtrl.vue
index 45649d22d..ddbdd848b 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/components/BannerCtrl.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/components/BannerCtrl.vue
@@ -72,37 +72,37 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import MainDonationFormPaymentMethodLabeledButton
 	from '@src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/components/BannerVar.vue b/banners/mobile/C24_WMDE_Mobile_DE_01/components/BannerVar.vue
index d9aa3796f..76b96bb09 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/components/BannerVar.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/components/BannerVar.vue
@@ -72,37 +72,37 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerTextVar.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import MainDonationFormPaymentMethodLabeledButton
 	from '@src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerTextVar.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerSlides.vue b/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerSlides.vue
index 4b2977183..7421f9bc2 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerSlides.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerSlides.vue
@@ -33,11 +33,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerText.vue b/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerText.vue
index ead96b604..e9910471c 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerText.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerText.vue
@@ -21,9 +21,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerTextVar.vue b/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerTextVar.vue
index 496e2d838..7e08bb30e 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerTextVar.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/content/BannerTextVar.vue
@@ -24,9 +24,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/event_map.ts b/banners/mobile/C24_WMDE_Mobile_DE_01/event_map.ts
index 7bb6ae360..182a12bef 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/event_map.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/event_map.ts
@@ -1,15 +1,15 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/form_items.ts b/banners/mobile/C24_WMDE_Mobile_DE_01/form_items.ts
index 53c204d06..41fccf31d 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/form_items.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_01/messages.ts b/banners/mobile/C24_WMDE_Mobile_DE_01/messages.ts
index 2c3aee789..c530b44bf 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_01/messages.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_01/messages.ts
@@ -1,10 +1,10 @@
+import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_02/banner_ctrl.ts b/banners/mobile/C24_WMDE_Mobile_DE_02/banner_ctrl.ts
index c472f3ba3..96d602893 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_02/banner_ctrl.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_02/banner_ctrl.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_02/banner_var.ts b/banners/mobile/C24_WMDE_Mobile_DE_02/banner_var.ts
index 6157e6425..3f4146b11 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_02/banner_var.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_02/banner_var.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_02/components/BannerCtrl.vue b/banners/mobile/C24_WMDE_Mobile_DE_02/components/BannerCtrl.vue
index 45649d22d..ddbdd848b 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_02/components/BannerCtrl.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_02/components/BannerCtrl.vue
@@ -72,37 +72,37 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import MainDonationFormPaymentMethodLabeledButton
 	from '@src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_02/components/BannerVar.vue b/banners/mobile/C24_WMDE_Mobile_DE_02/components/BannerVar.vue
index 45649d22d..ddbdd848b 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_02/components/BannerVar.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_02/components/BannerVar.vue
@@ -72,37 +72,37 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import MainDonationFormPaymentMethodLabeledButton
 	from '@src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_02/content/BannerSlides.vue b/banners/mobile/C24_WMDE_Mobile_DE_02/content/BannerSlides.vue
index 4b2977183..7421f9bc2 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_02/content/BannerSlides.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_02/content/BannerSlides.vue
@@ -33,11 +33,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_02/content/BannerText.vue b/banners/mobile/C24_WMDE_Mobile_DE_02/content/BannerText.vue
index ead96b604..e9910471c 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_02/content/BannerText.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_02/content/BannerText.vue
@@ -21,9 +21,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_02/event_map.ts b/banners/mobile/C24_WMDE_Mobile_DE_02/event_map.ts
index 7bb6ae360..182a12bef 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_02/event_map.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_02/event_map.ts
@@ -1,15 +1,15 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_02/form_items.ts b/banners/mobile/C24_WMDE_Mobile_DE_02/form_items.ts
index 53c204d06..41fccf31d 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_02/form_items.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_02/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_02/messages.ts b/banners/mobile/C24_WMDE_Mobile_DE_02/messages.ts
index 4495b6ae4..c990a98d8 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_02/messages.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_02/messages.ts
@@ -1,8 +1,8 @@
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignTextDe,
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_03/banner_ctrl.ts b/banners/mobile/C24_WMDE_Mobile_DE_03/banner_ctrl.ts
index c472f3ba3..96d602893 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_03/banner_ctrl.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_03/banner_ctrl.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_03/banner_var.ts b/banners/mobile/C24_WMDE_Mobile_DE_03/banner_var.ts
index ba042d074..21c7269bc 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_03/banner_var.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_03/banner_var.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_03/components/BannerCtrl.vue b/banners/mobile/C24_WMDE_Mobile_DE_03/components/BannerCtrl.vue
index d223193e9..6db9ad761 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_03/components/BannerCtrl.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_03/components/BannerCtrl.vue
@@ -72,36 +72,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_03/content/BannerSlides.vue b/banners/mobile/C24_WMDE_Mobile_DE_03/content/BannerSlides.vue
index 4b2977183..7421f9bc2 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_03/content/BannerSlides.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_03/content/BannerSlides.vue
@@ -33,11 +33,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_03/content/BannerText.vue b/banners/mobile/C24_WMDE_Mobile_DE_03/content/BannerText.vue
index ead96b604..e9910471c 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_03/content/BannerText.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_03/content/BannerText.vue
@@ -21,9 +21,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_03/event_map.ts b/banners/mobile/C24_WMDE_Mobile_DE_03/event_map.ts
index 7bb6ae360..182a12bef 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_03/event_map.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_03/event_map.ts
@@ -1,15 +1,15 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_03/form_items.ts b/banners/mobile/C24_WMDE_Mobile_DE_03/form_items.ts
index 53c204d06..41fccf31d 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_03/form_items.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_03/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_03/messages.ts b/banners/mobile/C24_WMDE_Mobile_DE_03/messages.ts
index 4712f4ca7..a152c19e2 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_03/messages.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_03/messages.ts
@@ -1,8 +1,8 @@
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignTextDe,
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_04/banner_ctrl.ts b/banners/mobile/C24_WMDE_Mobile_DE_04/banner_ctrl.ts
index df06730ea..2c000bb60 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_04/banner_ctrl.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_04/banner_ctrl.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_04/banner_var.ts b/banners/mobile/C24_WMDE_Mobile_DE_04/banner_var.ts
index 3de1a8053..fc1fd33f0 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_04/banner_var.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_04/banner_var.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_04/components/BannerCtrl.vue b/banners/mobile/C24_WMDE_Mobile_DE_04/components/BannerCtrl.vue
index d223193e9..6db9ad761 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_04/components/BannerCtrl.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_04/components/BannerCtrl.vue
@@ -72,36 +72,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_04/components/BannerVar.vue b/banners/mobile/C24_WMDE_Mobile_DE_04/components/BannerVar.vue
index 2fb77c6e6..26f69a55a 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_04/components/BannerVar.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_04/components/BannerVar.vue
@@ -72,38 +72,38 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormAction } from '@src/components/composables/useAmountBasedFormAction';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
-import { useFormAction } from '@src/components/composables/useAmountBasedFormAction';
-import { FormActions } from '@src/domain/FormActions';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { FormActions } from '@src/domain/FormActions';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_04/content/BannerSlides.vue b/banners/mobile/C24_WMDE_Mobile_DE_04/content/BannerSlides.vue
index f74820a92..ea275d9f8 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_04/content/BannerSlides.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_04/content/BannerSlides.vue
@@ -33,11 +33,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_04/content/BannerText.vue b/banners/mobile/C24_WMDE_Mobile_DE_04/content/BannerText.vue
index ead96b604..e9910471c 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_04/content/BannerText.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_04/content/BannerText.vue
@@ -21,9 +21,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_04/event_map.ts b/banners/mobile/C24_WMDE_Mobile_DE_04/event_map.ts
index 7bb6ae360..182a12bef 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_04/event_map.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_04/event_map.ts
@@ -1,15 +1,15 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_04/form_items.ts b/banners/mobile/C24_WMDE_Mobile_DE_04/form_items.ts
index 53c204d06..41fccf31d 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_04/form_items.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_04/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_04/messages.ts b/banners/mobile/C24_WMDE_Mobile_DE_04/messages.ts
index 4712f4ca7..a152c19e2 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_04/messages.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_04/messages.ts
@@ -1,8 +1,8 @@
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignTextDe,
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_05/banner_ctrl.ts b/banners/mobile/C24_WMDE_Mobile_DE_05/banner_ctrl.ts
index df06730ea..2c000bb60 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_05/banner_ctrl.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_05/banner_ctrl.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_05/banner_var.ts b/banners/mobile/C24_WMDE_Mobile_DE_05/banner_var.ts
index 165b8e8a6..cc386b317 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_05/banner_var.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_05/banner_var.ts
@@ -3,25 +3,25 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_05/components/BannerCtrl.vue b/banners/mobile/C24_WMDE_Mobile_DE_05/components/BannerCtrl.vue
index d223193e9..6db9ad761 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_05/components/BannerCtrl.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_05/components/BannerCtrl.vue
@@ -72,36 +72,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_05/components/BannerVar.vue b/banners/mobile/C24_WMDE_Mobile_DE_05/components/BannerVar.vue
index ee08ac1e3..361d74a3b 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_05/components/BannerVar.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_05/components/BannerVar.vue
@@ -72,36 +72,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner_var.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner_var.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_05/content/BannerSlides.vue b/banners/mobile/C24_WMDE_Mobile_DE_05/content/BannerSlides.vue
index f74820a92..ea275d9f8 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_05/content/BannerSlides.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_05/content/BannerSlides.vue
@@ -33,11 +33,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_05/content/BannerText.vue b/banners/mobile/C24_WMDE_Mobile_DE_05/content/BannerText.vue
index ead96b604..e9910471c 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_05/content/BannerText.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_05/content/BannerText.vue
@@ -21,9 +21,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_05/event_map.ts b/banners/mobile/C24_WMDE_Mobile_DE_05/event_map.ts
index 7bb6ae360..182a12bef 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_05/event_map.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_05/event_map.ts
@@ -1,15 +1,15 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_05/form_items.ts b/banners/mobile/C24_WMDE_Mobile_DE_05/form_items.ts
index 53c204d06..41fccf31d 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_05/form_items.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_05/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_05/messages.ts b/banners/mobile/C24_WMDE_Mobile_DE_05/messages.ts
index 4712f4ca7..a152c19e2 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_05/messages.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_05/messages.ts
@@ -1,8 +1,8 @@
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignTextDe,
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/banner_ctrl.ts b/banners/mobile/C24_WMDE_Mobile_DE_06/banner_ctrl.ts
index 9bd77f7f5..b2bea9bed 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/banner_ctrl.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/banner_ctrl.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
 import eventMappings from './event_map';
-import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/banner_var.ts b/banners/mobile/C24_WMDE_Mobile_DE_06/banner_var.ts
index 936510cea..cd6427460 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/banner_var.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/banner_var.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
 import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
 import eventMappings from './event_map';
-import messages from './messages_var';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
-import { LocalStorageCloseTracker } from '@src/utils/LocalCloseTracker';
-import { WindowTimer } from '@src/utils/Timer';
+import messages from './messages_var';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerCtrl.vue b/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerCtrl.vue
index 47a624363..e84aaf688 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerCtrl.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerCtrl.vue
@@ -76,39 +76,39 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerVar.vue b/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerVar.vue
index 1191153ce..8d2145b9c 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerVar.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerVar.vue
@@ -102,40 +102,40 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import MainDonationFormButton from '@src/components/DonationForm/Forms/MainDonationFormButton.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
-import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/content/BannerSlides.vue b/banners/mobile/C24_WMDE_Mobile_DE_06/content/BannerSlides.vue
index d6f929e72..bb510c5f3 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/content/BannerSlides.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/content/BannerSlides.vue
@@ -39,12 +39,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/content/BannerText.vue b/banners/mobile/C24_WMDE_Mobile_DE_06/content/BannerText.vue
index 471c199fd..0e44d1d07 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/content/BannerText.vue
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/content/BannerText.vue
@@ -21,9 +21,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/event_map.ts b/banners/mobile/C24_WMDE_Mobile_DE_06/event_map.ts
index d7a00a5dd..92e24a9bd 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/event_map.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/event_map.ts
@@ -1,16 +1,16 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/form_items.ts b/banners/mobile/C24_WMDE_Mobile_DE_06/form_items.ts
index 53c204d06..41fccf31d 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/form_items.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/messages.ts b/banners/mobile/C24_WMDE_Mobile_DE_06/messages.ts
index 74061bbe8..27596d08c 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/messages.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/messages.ts
@@ -1,8 +1,8 @@
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignTextDe,
diff --git a/banners/mobile/C24_WMDE_Mobile_DE_06/messages_var.ts b/banners/mobile/C24_WMDE_Mobile_DE_06/messages_var.ts
index 7e3d0081e..a791feb5f 100644
--- a/banners/mobile/C24_WMDE_Mobile_DE_06/messages_var.ts
+++ b/banners/mobile/C24_WMDE_Mobile_DE_06/messages_var.ts
@@ -1,9 +1,9 @@
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignTextDe,
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/banner_ctrl.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_00/banner_ctrl.ts
index 2d6f715db..fec742774 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/banner_ctrl.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/banner_ctrl.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { Locales } from '@src/domain/Locales';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import eventMappings from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/banner_var.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_00/banner_var.ts
index a7998c2e8..a70972eb5 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/banner_var.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/banner_var.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { Locales } from '@src/domain/Locales';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import eventMappings from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/BannerCtrl.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/BannerCtrl.vue
index 85654f380..c3794ea37 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/BannerCtrl.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/BannerCtrl.vue
@@ -86,36 +86,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
-import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import {
 	createSubmittableMainDonationFormSinglePage
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePage';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import SmsIcon from '@src/components/Icons/SmsIcon.vue';
+import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
+import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import SmsIcon from '@src/components/Icons/SmsIcon.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 const formModel = useFormModel();
 
 enum ContentStates {
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/BannerVar.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/BannerVar.vue
index 4d57aa0db..303108ba9 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/BannerVar.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/BannerVar.vue
@@ -86,36 +86,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
-import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import {
 	createSubmittableMainDonationFormSinglePageAnonymous
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import SmsIcon from '@src/components/Icons/SmsIcon.vue';
+import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
+import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import SmsIcon from '@src/components/Icons/SmsIcon.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 const formModel = useFormModel();
 
 enum ContentStates {
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/MiniBanner.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/MiniBanner.vue
index 3d6ced80f..606d7cd2d 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/MiniBanner.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/components/MiniBanner.vue
@@ -37,11 +37,11 @@
 
 <script setup lang="ts">
 
+import CloseIconCircle from '@src/components/Icons/CloseIconCircle.vue';
+import SmsIcon from '@src/components/Icons/SmsIcon.vue';
+import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
 import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
-import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
-import SmsIcon from '@src/components/Icons/SmsIcon.vue';
-import CloseIconCircle from '@src/components/Icons/CloseIconCircle.vue';
 
 defineEmits( [ 'showFullPageBanner', 'showFullPageBannerPreselectedAmount', 'close' ] );
 
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/content/BannerSlides.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_00/content/BannerSlides.vue
index 273469555..531cf58d0 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/content/BannerSlides.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/content/BannerSlides.vue
@@ -31,11 +31,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/content/BannerText.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_00/content/BannerText.vue
index 266fc9ccd..fc22e62d9 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/content/BannerText.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/content/BannerText.vue
@@ -22,8 +22,8 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/event_map.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_00/event_map.ts
index 7936f49f5..acfbe2b8b 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/event_map.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/event_map.ts
@@ -1,13 +1,13 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/form_items.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_00/form_items.ts
index 9bd827201..e3046ef82 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/form_items.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_00/messages.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_00/messages.ts
index 2f7df0d5d..0fa423cc4 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_00/messages.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_00/messages.ts
@@ -1,9 +1,9 @@
 import CustomAmountForm from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
-import DynamicCampaignText from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
-import { TranslationMessages } from '@src/Translator';
-import SoftClose from '@src/components/SoftClose/messages/SoftClose.en';
-import Footer from '@src/components/Footer/messages/Footer.en';
 import MainDonationForm from '@src/components/DonationForm/Forms/messages/MainDonationForm.en';
+import Footer from '@src/components/Footer/messages/Footer.en';
+import SoftClose from '@src/components/SoftClose/messages/SoftClose.en';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignText from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
 
 const messages: TranslationMessages = {
 	...CustomAmountForm,
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/banner_ctrl.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_01/banner_ctrl.ts
index 2d6f715db..fec742774 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/banner_ctrl.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/banner_ctrl.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { Locales } from '@src/domain/Locales';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import eventMappings from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/banner_var.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_01/banner_var.ts
index c939a790b..8b7c188c5 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/banner_var.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/banner_var.ts
@@ -3,26 +3,26 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import { Locales } from '@src/domain/Locales';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
 import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
-import { Locales } from '@src/domain/Locales';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import eventMappings from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryEn();
 const translator = new Translator( messages );
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerCtrl.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerCtrl.vue
index 38655b233..3e2928b2a 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerCtrl.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerCtrl.vue
@@ -114,37 +114,37 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { createSubmittableMainDonationForm } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
+import { createSubmittableUpgradeToYearly } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
 import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import SmsIcon from '@src/components/Icons/SmsIcon.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import SmsIcon from '@src/components/Icons/SmsIcon.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { createSubmittableMainDonationForm } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
-import { createSubmittableUpgradeToYearly } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { UseOfFundsShownEvent } from '@src/tracking/events/UseOfFundsShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 const formModel = useFormModel();
 
 enum ContentStates {
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerVar.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerVar.vue
index c847141e5..9d0f3ebc0 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerVar.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerVar.vue
@@ -116,37 +116,37 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBannerVar.vue';
-import MiniBanner from './MiniBannerVar.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import BannerSlides from '../content/BannerSlides.vue';
+import { createSubmittableMainDonationForm } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
+import { createSubmittableUpgradeToYearly } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
 import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import SmsIcon from '@src/components/Icons/SmsIcon.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import SmsIcon from '@src/components/Icons/SmsIcon.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { createSubmittableMainDonationForm } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
-import { createSubmittableUpgradeToYearly } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { UseOfFundsShownEvent } from '@src/tracking/events/UseOfFundsShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBannerVar.vue';
+import MiniBanner from './MiniBannerVar.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 const formModel = useFormModel();
 
 enum ContentStates {
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/MiniBanner.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/MiniBanner.vue
index 7679d2632..d9bef0ae1 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/MiniBanner.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/MiniBanner.vue
@@ -37,11 +37,11 @@
 
 <script setup lang="ts">
 
+import CloseIconCircle from '@src/components/Icons/CloseIconCircle.vue';
+import SmsIcon from '@src/components/Icons/SmsIcon.vue';
+import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
 import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
-import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
-import SmsIcon from '@src/components/Icons/SmsIcon.vue';
-import CloseIconCircle from '@src/components/Icons/CloseIconCircle.vue';
 
 defineEmits( [ 'showFullPageBanner', 'showFullPageBannerPreselectedAmount', 'close' ] );
 
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/MiniBannerVar.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/MiniBannerVar.vue
index 09b9c8d5a..c25502d59 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/MiniBannerVar.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/MiniBannerVar.vue
@@ -37,11 +37,11 @@
 
 <script setup lang="ts">
 
+import CloseIconCircle from '@src/components/Icons/CloseIconCircle.vue';
+import SmsIcon from '@src/components/Icons/SmsIcon.vue';
+import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
 import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
 import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
-import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
-import SmsIcon from '@src/components/Icons/SmsIcon.vue';
-import CloseIconCircle from '@src/components/Icons/CloseIconCircle.vue';
 import SimpleInfoIcon from './SimpleInfoIcon.vue';
 
 defineEmits( [ 'showFullPageBanner', 'showFullPageBannerPreselectedAmount', 'close', 'showUseOfFunds' ] );
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/content/BannerSlides.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_01/content/BannerSlides.vue
index 273469555..531cf58d0 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/content/BannerSlides.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/content/BannerSlides.vue
@@ -31,11 +31,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/content/BannerText.vue b/banners/mobile_english/C24_WMDE_Mobile_EN_01/content/BannerText.vue
index 266fc9ccd..fc22e62d9 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/content/BannerText.vue
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/content/BannerText.vue
@@ -22,8 +22,8 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/event_map.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_01/event_map.ts
index d2752a525..d65526272 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/event_map.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/event_map.ts
@@ -1,16 +1,16 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { UseOfFundsShownEvent } from '@src/tracking/events/UseOfFundsShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { UseOfFundsShownEvent } from '@src/tracking/events/UseOfFundsShownEvent';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/form_items.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_01/form_items.ts
index 9bd827201..e3046ef82 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/form_items.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/mobile_english/C24_WMDE_Mobile_EN_01/messages.ts b/banners/mobile_english/C24_WMDE_Mobile_EN_01/messages.ts
index e06389ff7..aca394f9a 100644
--- a/banners/mobile_english/C24_WMDE_Mobile_EN_01/messages.ts
+++ b/banners/mobile_english/C24_WMDE_Mobile_EN_01/messages.ts
@@ -1,10 +1,10 @@
 import CustomAmountForm from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en';
-import DynamicCampaignText from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
-import { TranslationMessages } from '@src/Translator';
-import SoftClose from '@src/components/SoftClose/messages/SoftClose.en';
-import Footer from '@src/components/Footer/messages/Footer.en';
 import MainDonationForm from '@src/components/DonationForm/Forms/messages/MainDonationForm.en';
 import UpgradeToYearly from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en';
+import Footer from '@src/components/Footer/messages/Footer.en';
+import SoftClose from '@src/components/SoftClose/messages/SoftClose.en';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignText from '@src/utils/DynamicContent/messages/DynamicCampaignText.en';
 
 const messages: TranslationMessages = {
 	...CustomAmountForm,
diff --git a/banners/pad/C24_WMDE_iPad_00/banner_ctrl.ts b/banners/pad/C24_WMDE_iPad_00/banner_ctrl.ts
index 07cefb7e4..5d19ff7c8 100644
--- a/banners/pad/C24_WMDE_iPad_00/banner_ctrl.ts
+++ b/banners/pad/C24_WMDE_iPad_00/banner_ctrl.ts
@@ -3,24 +3,24 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import eventMappings from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/pad/C24_WMDE_iPad_00/banner_var.ts b/banners/pad/C24_WMDE_iPad_00/banner_var.ts
index f353ab4fa..c73044694 100644
--- a/banners/pad/C24_WMDE_iPad_00/banner_var.ts
+++ b/banners/pad/C24_WMDE_iPad_00/banner_var.ts
@@ -3,24 +3,24 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import eventMappings from './event_map';
 import { createFormItems } from './form_items_var';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/pad/C24_WMDE_iPad_00/components/BannerCtrl.vue b/banners/pad/C24_WMDE_iPad_00/components/BannerCtrl.vue
index 560624258..e1fdf046f 100644
--- a/banners/pad/C24_WMDE_iPad_00/components/BannerCtrl.vue
+++ b/banners/pad/C24_WMDE_iPad_00/components/BannerCtrl.vue
@@ -75,32 +75,32 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { nextTick, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/pad/C24_WMDE_iPad_00/components/BannerVar.vue b/banners/pad/C24_WMDE_iPad_00/components/BannerVar.vue
index 43a2d535b..5401120d3 100644
--- a/banners/pad/C24_WMDE_iPad_00/components/BannerVar.vue
+++ b/banners/pad/C24_WMDE_iPad_00/components/BannerVar.vue
@@ -92,36 +92,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { nextTick, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
+import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
 import SepaLogo from '@src/components/PaymentLogos/SepaLogo.vue';
 import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
-import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/pad/C24_WMDE_iPad_00/components/MainBanner.vue b/banners/pad/C24_WMDE_iPad_00/components/MainBanner.vue
index 163034152..7e9040981 100644
--- a/banners/pad/C24_WMDE_iPad_00/components/MainBanner.vue
+++ b/banners/pad/C24_WMDE_iPad_00/components/MainBanner.vue
@@ -16,9 +16,9 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/pad/C24_WMDE_iPad_00/content/BannerSlides.vue b/banners/pad/C24_WMDE_iPad_00/content/BannerSlides.vue
index 3cbf0d6f2..faa0d424e 100644
--- a/banners/pad/C24_WMDE_iPad_00/content/BannerSlides.vue
+++ b/banners/pad/C24_WMDE_iPad_00/content/BannerSlides.vue
@@ -23,10 +23,10 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject } from 'vue';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/pad/C24_WMDE_iPad_00/event_map.ts b/banners/pad/C24_WMDE_iPad_00/event_map.ts
index 3ab209f3c..f256da758 100644
--- a/banners/pad/C24_WMDE_iPad_00/event_map.ts
+++ b/banners/pad/C24_WMDE_iPad_00/event_map.ts
@@ -1,15 +1,15 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { ClickAlreadyDonatedEvent } from '@src/tracking/events/ClickAlreadyDonatedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/pad/C24_WMDE_iPad_00/form_items.ts b/banners/pad/C24_WMDE_iPad_00/form_items.ts
index 4a5d461a4..58e8b8cbc 100644
--- a/banners/pad/C24_WMDE_iPad_00/form_items.ts
+++ b/banners/pad/C24_WMDE_iPad_00/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/pad/C24_WMDE_iPad_00/form_items_var.ts b/banners/pad/C24_WMDE_iPad_00/form_items_var.ts
index b37f2304c..b6c4d4f9f 100644
--- a/banners/pad/C24_WMDE_iPad_00/form_items_var.ts
+++ b/banners/pad/C24_WMDE_iPad_00/form_items_var.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/pad/C24_WMDE_iPad_00/messages.ts b/banners/pad/C24_WMDE_iPad_00/messages.ts
index 01cb600fb..6a087eda1 100644
--- a/banners/pad/C24_WMDE_iPad_00/messages.ts
+++ b/banners/pad/C24_WMDE_iPad_00/messages.ts
@@ -1,11 +1,11 @@
-import DynamicCampaignText from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
+import MainDonationForm from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearly from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import SoftClose from '@src/components/SoftClose/messages/SoftClose.de';
 import Footer from '@src/components/Footer/messages/Footer.de';
-import MainDonationForm from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
-import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import SoftClose from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignText from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignText,
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/banner_ctrl.ts b/banners/pad/C24_WMDE_iPad_DE_01/banner_ctrl.ts
index 07cefb7e4..5d19ff7c8 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/banner_ctrl.ts
+++ b/banners/pad/C24_WMDE_iPad_DE_01/banner_ctrl.ts
@@ -3,24 +3,24 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import eventMappings from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/banner_var.ts b/banners/pad/C24_WMDE_iPad_DE_01/banner_var.ts
index 8ec6cc011..7e087a19e 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/banner_var.ts
+++ b/banners/pad/C24_WMDE_iPad_DE_01/banner_var.ts
@@ -3,24 +3,24 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
-import PageWPORG from '@src/page/PageWPORG';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
+import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import eventMappings from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import eventMappings from './event_map';
 import { createFormItems } from './form_items_var';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryDe } from '@src/utils/LocaleFactory/LocaleFactoryDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryDe();
 const translator = new Translator( messages );
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/components/BannerCtrl.vue b/banners/pad/C24_WMDE_iPad_DE_01/components/BannerCtrl.vue
index 7828a2c88..de48172a6 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/components/BannerCtrl.vue
+++ b/banners/pad/C24_WMDE_iPad_DE_01/components/BannerCtrl.vue
@@ -110,36 +110,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { nextTick, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
+import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
 import SepaLogo from '@src/components/PaymentLogos/SepaLogo.vue';
 import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
-import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/components/BannerVar.vue b/banners/pad/C24_WMDE_iPad_DE_01/components/BannerVar.vue
index 63337c91e..4cfad9ae9 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/components/BannerVar.vue
+++ b/banners/pad/C24_WMDE_iPad_DE_01/components/BannerVar.vue
@@ -110,36 +110,36 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { nextTick, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerSlides from '../content/BannerSlidesVar.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
+import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
 import SepaLogo from '@src/components/PaymentLogos/SepaLogo.vue';
 import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
-import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlidesVar.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/components/MainBanner.vue b/banners/pad/C24_WMDE_iPad_DE_01/components/MainBanner.vue
index 163034152..7e9040981 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/components/MainBanner.vue
+++ b/banners/pad/C24_WMDE_iPad_DE_01/components/MainBanner.vue
@@ -16,9 +16,9 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/content/BannerSlides.vue b/banners/pad/C24_WMDE_iPad_DE_01/content/BannerSlides.vue
index 7942adbb3..6dca766af 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/content/BannerSlides.vue
+++ b/banners/pad/C24_WMDE_iPad_DE_01/content/BannerSlides.vue
@@ -29,12 +29,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/content/BannerSlidesVar.vue b/banners/pad/C24_WMDE_iPad_DE_01/content/BannerSlidesVar.vue
index 69526af82..bad748473 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/content/BannerSlidesVar.vue
+++ b/banners/pad/C24_WMDE_iPad_DE_01/content/BannerSlidesVar.vue
@@ -29,12 +29,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/event_map.ts b/banners/pad/C24_WMDE_iPad_DE_01/event_map.ts
index 3ab209f3c..f256da758 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/event_map.ts
+++ b/banners/pad/C24_WMDE_iPad_DE_01/event_map.ts
@@ -1,15 +1,15 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { ClickAlreadyDonatedEvent } from '@src/tracking/events/ClickAlreadyDonatedEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
+import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ CloseEvent.EVENT_NAME, mapCloseEvent ],
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/form_items.ts b/banners/pad/C24_WMDE_iPad_DE_01/form_items.ts
index b37f2304c..b6c4d4f9f 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/form_items.ts
+++ b/banners/pad/C24_WMDE_iPad_DE_01/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/form_items_var.ts b/banners/pad/C24_WMDE_iPad_DE_01/form_items_var.ts
index 20cb1992f..44f64d933 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/form_items_var.ts
+++ b/banners/pad/C24_WMDE_iPad_DE_01/form_items_var.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/pad/C24_WMDE_iPad_DE_01/messages.ts b/banners/pad/C24_WMDE_iPad_DE_01/messages.ts
index 0bfdb9f0b..772a4590b 100644
--- a/banners/pad/C24_WMDE_iPad_DE_01/messages.ts
+++ b/banners/pad/C24_WMDE_iPad_DE_01/messages.ts
@@ -1,11 +1,11 @@
-import DynamicCampaignText from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
+import MainDonationForm from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearly from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import SoftClose from '@src/components/SoftClose/messages/SoftClose.de';
 import Footer from '@src/components/Footer/messages/Footer.de';
-import MainDonationForm from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
-import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import SoftClose from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignText from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...DynamicCampaignText,
diff --git a/banners/thank_you/MembershipFormActions.ts b/banners/thank_you/MembershipFormActions.ts
index f57da5fb5..bb95d5a30 100644
--- a/banners/thank_you/MembershipFormActions.ts
+++ b/banners/thank_you/MembershipFormActions.ts
@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
+import { Locales } from '@src/domain/Locales';
 import { TrackingParameters } from '@src/domain/TrackingParameters';
 import { ImpressionCount } from '@src/utils/ImpressionCount';
-import { Locales } from '@src/domain/Locales';
 
 const MEMBERSHIP_FORM_URL = 'https://spenden.wikimedia.de/apply-for-membership';
 
diff --git a/banners/thank_you/banner_ctrl.de.ts b/banners/thank_you/banner_ctrl.de.ts
index ca8149119..3880c93e7 100644
--- a/banners/thank_you/banner_ctrl.de.ts
+++ b/banners/thank_you/banner_ctrl.de.ts
@@ -2,26 +2,26 @@ import { createVueApp } from '@src/createVueApp';
 
 import './styles/styles.scss';
 
+import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
+import { Locales } from '@src/domain/Locales';
+import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
 import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
 import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
 import Banner from './components/BannerCtrl.de.vue';
-import messages from './messages.de';
+import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
 import eventMappings from './event_map';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { TrackingMembershipFormActions } from './MembershipFormActions';
-import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
+import messages from './messages.de';
 import { createThankYouSettings } from './settings';
-import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
-import { Locales } from '@src/domain/Locales';
-import { WindowTimer } from '@src/utils/Timer';
 
 const translator = new Translator( messages );
 const mediaWiki = new WindowMediaWiki();
diff --git a/banners/thank_you/banner_ctrl.en.ts b/banners/thank_you/banner_ctrl.en.ts
index 8977aceb7..dfd48f6bf 100644
--- a/banners/thank_you/banner_ctrl.en.ts
+++ b/banners/thank_you/banner_ctrl.en.ts
@@ -2,26 +2,26 @@ import { createVueApp } from '@src/createVueApp';
 
 import './styles/styles.scss';
 
+import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
+import { Locales } from '@src/domain/Locales';
+import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
 import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
 import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
 import Banner from './components/BannerCtrl.en.vue';
-import messages from './messages.en';
+import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
 import eventMappings from './event_map';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { TrackingMembershipFormActions } from './MembershipFormActions';
-import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
+import messages from './messages.en';
 import { createThankYouSettings } from './settings';
-import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
-import { Locales } from '@src/domain/Locales';
-import { WindowTimer } from '@src/utils/Timer';
 
 const translator = new Translator( messages );
 const mediaWiki = new WindowMediaWiki();
diff --git a/banners/thank_you/banner_ctrl.wpde.ts b/banners/thank_you/banner_ctrl.wpde.ts
index 98a8a2b8b..9ad58f63d 100644
--- a/banners/thank_you/banner_ctrl.wpde.ts
+++ b/banners/thank_you/banner_ctrl.wpde.ts
@@ -1,23 +1,23 @@
 import { createVueApp } from '@src/createVueApp';
 
 import './styles/styles.scss';
+import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
+import { Locales } from '@src/domain/Locales';
+import PageWPDE from '@src/page/PageWPDE';
+import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
 import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
 import Banner from './components/BannerCtrl.de.vue';
-import messages from './messages.de';
-import TranslationPlugin from '@src/TranslationPlugin';
-import { TrackingMembershipFormActions } from './MembershipFormActions';
 import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
-import PageWPDE from '@src/page/PageWPDE';
-import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
 import eventMap from './event_map.wpde';
+import { TrackingMembershipFormActions } from './MembershipFormActions';
+import messages from './messages.de';
 import { createThankYouSettings } from './settings';
-import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
-import { Locales } from '@src/domain/Locales';
-import { WindowTimer } from '@src/utils/Timer';
 
 // Tracking placeholders will be replaced by webpack string-replace-loader
 // using the campaign configuration ( campaign_info.toml ) for the correct values
diff --git a/banners/thank_you/banner_var.de.ts b/banners/thank_you/banner_var.de.ts
index 916c28b8a..e4cffc27e 100644
--- a/banners/thank_you/banner_var.de.ts
+++ b/banners/thank_you/banner_var.de.ts
@@ -2,26 +2,26 @@ import { createVueApp } from '@src/createVueApp';
 
 import './styles/styles.scss';
 
+import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
+import { Locales } from '@src/domain/Locales';
+import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
 import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
 import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
 import Banner from './components/BannerVar.de.vue';
-import messages from './messages.de';
+import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
 import eventMappings from './event_map';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { TrackingMembershipFormActions } from './MembershipFormActions';
-import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
+import messages from './messages.de';
 import { createThankYouSettings } from './settings';
-import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
-import { Locales } from '@src/domain/Locales';
-import { WindowTimer } from '@src/utils/Timer';
 
 const translator = new Translator( messages );
 const mediaWiki = new WindowMediaWiki();
diff --git a/banners/thank_you/banner_var.en.ts b/banners/thank_you/banner_var.en.ts
index 5d8453104..7573bb543 100644
--- a/banners/thank_you/banner_var.en.ts
+++ b/banners/thank_you/banner_var.en.ts
@@ -2,26 +2,26 @@ import { createVueApp } from '@src/createVueApp';
 
 import './styles/styles.scss';
 
+import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
+import { Locales } from '@src/domain/Locales';
+import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
 import PageWPORG from '@src/page/PageWPORG';
 import { SkinFactory } from '@src/page/skin/SkinFactory';
-import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG';
-import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
 import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker';
+import { WindowTimer } from '@src/utils/Timer';
 import Banner from './components/BannerVar.en.vue';
-import messages from './messages.en';
+import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
 import eventMappings from './event_map';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { TrackingMembershipFormActions } from './MembershipFormActions';
-import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
+import messages from './messages.en';
 import { createThankYouSettings } from './settings';
-import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
-import { Locales } from '@src/domain/Locales';
-import { WindowTimer } from '@src/utils/Timer';
 
 const translator = new Translator( messages );
 const mediaWiki = new WindowMediaWiki();
diff --git a/banners/thank_you/banner_var.wpde.ts b/banners/thank_you/banner_var.wpde.ts
index cacfcd560..9523ab17e 100644
--- a/banners/thank_you/banner_var.wpde.ts
+++ b/banners/thank_you/banner_var.wpde.ts
@@ -1,23 +1,23 @@
 import { createVueApp } from '@src/createVueApp';
 
 import './styles/styles.scss';
+import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
+import { Locales } from '@src/domain/Locales';
+import PageWPDE from '@src/page/PageWPDE';
+import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
-import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
 import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
 import Banner from './components/BannerVar.de.vue';
-import messages from './messages.de';
-import TranslationPlugin from '@src/TranslationPlugin';
-import { TrackingMembershipFormActions } from './MembershipFormActions';
 import { createTrackedURL, SUBSCRIBE_URL, USE_OF_FUNDS_URL } from './createTrackedURL';
-import PageWPDE from '@src/page/PageWPDE';
-import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
 import eventMap from './event_map.wpde';
+import { TrackingMembershipFormActions } from './MembershipFormActions';
+import messages from './messages.de';
 import { createThankYouSettings } from './settings';
-import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
-import { Locales } from '@src/domain/Locales';
-import { WindowTimer } from '@src/utils/Timer';
 
 // Tracking placeholders will be replaced by webpack string-replace-loader
 // using the campaign configuration ( campaign_info.toml ) for the correct values
diff --git a/banners/thank_you/components/BannerCtrl.de.vue b/banners/thank_you/components/BannerCtrl.de.vue
index 15bbe35a2..ec9155920 100644
--- a/banners/thank_you/components/BannerCtrl.de.vue
+++ b/banners/thank_you/components/BannerCtrl.de.vue
@@ -74,26 +74,26 @@
 
 <script setup lang="ts">
 import { inject, ref } from 'vue';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
-import MiniBanner from './MiniBanner.vue';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import FullPageBanner from './FullPageBanner.vue';
-import colors from '../styles/settings/colors';
-import MiniBannerTextWin from '../content/win/MiniBannerText.de.vue';
-import MiniBannerSlidesWin from '../content/win/MiniBannerSlides.de.vue';
-import FullPageBannerTextWin from '../content/win/FullPageBannerText.de.vue';
-import MiniBannerTextLose from '../content/lose/MiniBannerText.de.vue';
-import MiniBannerSlidesLose from '../content/lose/MiniBannerSlides.de.vue';
+import MembershipFormButton from './MembershipButton.vue';
+import MiniBanner from './MiniBanner.vue';
+import ProgressBar from './ProgressBar.vue';
 import FullPageBannerTextLose from '../content/lose/FullPageBannerText.de.vue';
+import MiniBannerSlidesLose from '../content/lose/MiniBannerSlides.de.vue';
+import MiniBannerTextLose from '../content/lose/MiniBannerText.de.vue';
 import MembershipBenefits from '../content/MembershipBenefits.de.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ProgressBar from './ProgressBar.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
-import MembershipFormButton from './MembershipButton.vue';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import FullPageBannerTextWin from '../content/win/FullPageBannerText.de.vue';
+import MiniBannerSlidesWin from '../content/win/MiniBannerSlides.de.vue';
+import MiniBannerTextWin from '../content/win/MiniBannerText.de.vue';
 import { ThankYouSettings } from '../settings';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import colors from '../styles/settings/colors';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/thank_you/components/BannerCtrl.en.vue b/banners/thank_you/components/BannerCtrl.en.vue
index 7c8bc6d81..ababe7d54 100644
--- a/banners/thank_you/components/BannerCtrl.en.vue
+++ b/banners/thank_you/components/BannerCtrl.en.vue
@@ -74,26 +74,26 @@
 
 <script setup lang="ts">
 import { inject, ref } from 'vue';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
-import MiniBanner from './MiniBanner.vue';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import FullPageBanner from './FullPageBanner.vue';
-import colors from '../styles/settings/colors';
-import MiniBannerTextWin from '../content/win/MiniBannerText.en.vue';
-import MiniBannerSlidesWin from '../content/win/MiniBannerSlides.en.vue';
-import FullPageBannerTextWin from '../content/win/FullPageBannerText.en.vue';
-import MiniBannerTextLose from '../content/lose/MiniBannerText.en.vue';
-import MiniBannerSlidesLose from '../content/lose/MiniBannerSlides.en.vue';
+import MembershipFormButton from './MembershipButton.vue';
+import MiniBanner from './MiniBanner.vue';
+import ProgressBar from './ProgressBar.vue';
 import FullPageBannerTextLose from '../content/lose/FullPageBannerText.en.vue';
+import MiniBannerSlidesLose from '../content/lose/MiniBannerSlides.en.vue';
+import MiniBannerTextLose from '../content/lose/MiniBannerText.en.vue';
 import MembershipBenefits from '../content/MembershipBenefits.en.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ProgressBar from './ProgressBar.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
-import MembershipFormButton from './MembershipButton.vue';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import FullPageBannerTextWin from '../content/win/FullPageBannerText.en.vue';
+import MiniBannerSlidesWin from '../content/win/MiniBannerSlides.en.vue';
+import MiniBannerTextWin from '../content/win/MiniBannerText.en.vue';
 import { ThankYouSettings } from '../settings';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import colors from '../styles/settings/colors';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/thank_you/components/BannerVar.de.vue b/banners/thank_you/components/BannerVar.de.vue
index 756ec9a8a..f0bac9fd9 100644
--- a/banners/thank_you/components/BannerVar.de.vue
+++ b/banners/thank_you/components/BannerVar.de.vue
@@ -83,26 +83,26 @@
 
 <script setup lang="ts">
 import { inject, ref } from 'vue';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
-import MiniBanner from './MiniBanner.vue';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import FullPageBanner from './FullPageBanner.vue';
-import colors from '../styles/settings/colors';
-import MiniBannerTextWin from '../content/win/MiniBannerText.de.vue';
-import MiniBannerSlidesWin from '../content/win/MiniBannerSlides.de.vue';
-import FullPageBannerTextWin from '../content/win/FullPageBannerText.de.vue';
-import MiniBannerTextLose from '../content/lose/MiniBannerText.de.vue';
-import MiniBannerSlidesLose from '../content/lose/MiniBannerSlides.de.vue';
+import MembershipFormButton from './MembershipButton.vue';
+import MiniBanner from './MiniBanner.vue';
+import ProgressBar from './ProgressBar.vue';
 import FullPageBannerTextLose from '../content/lose/FullPageBannerText.de.vue';
+import MiniBannerSlidesLose from '../content/lose/MiniBannerSlides.de.vue';
+import MiniBannerTextLose from '../content/lose/MiniBannerText.de.vue';
 import MembershipBenefits from '../content/MembershipBenefits.de.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ProgressBar from './ProgressBar.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
-import MembershipFormButton from './MembershipButton.vue';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import FullPageBannerTextWin from '../content/win/FullPageBannerText.de.vue';
+import MiniBannerSlidesWin from '../content/win/MiniBannerSlides.de.vue';
+import MiniBannerTextWin from '../content/win/MiniBannerText.de.vue';
 import { ThankYouSettings } from '../settings';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import colors from '../styles/settings/colors';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/thank_you/components/BannerVar.en.vue b/banners/thank_you/components/BannerVar.en.vue
index e48fa551e..45564a45f 100644
--- a/banners/thank_you/components/BannerVar.en.vue
+++ b/banners/thank_you/components/BannerVar.en.vue
@@ -83,26 +83,26 @@
 
 <script setup lang="ts">
 import { inject, ref } from 'vue';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import { CloseChoices } from '@src/domain/CloseChoices';
-import MiniBanner from './MiniBanner.vue';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import FullPageBanner from './FullPageBanner.vue';
-import colors from '../styles/settings/colors';
-import MiniBannerTextWin from '../content/win/MiniBannerText.en.vue';
-import MiniBannerSlidesWin from '../content/win/MiniBannerSlides.en.vue';
-import FullPageBannerTextWin from '../content/win/FullPageBannerText.en.vue';
-import MiniBannerTextLose from '../content/lose/MiniBannerText.en.vue';
-import MiniBannerSlidesLose from '../content/lose/MiniBannerSlides.en.vue';
+import MembershipFormButton from './MembershipButton.vue';
+import MiniBanner from './MiniBanner.vue';
+import ProgressBar from './ProgressBar.vue';
 import FullPageBannerTextLose from '../content/lose/FullPageBannerText.en.vue';
+import MiniBannerSlidesLose from '../content/lose/MiniBannerSlides.en.vue';
+import MiniBannerTextLose from '../content/lose/MiniBannerText.en.vue';
 import MembershipBenefits from '../content/MembershipBenefits.en.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ProgressBar from './ProgressBar.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
-import MembershipFormButton from './MembershipButton.vue';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import FullPageBannerTextWin from '../content/win/FullPageBannerText.en.vue';
+import MiniBannerSlidesWin from '../content/win/MiniBannerSlides.en.vue';
+import MiniBannerTextWin from '../content/win/MiniBannerText.en.vue';
 import { ThankYouSettings } from '../settings';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import colors from '../styles/settings/colors';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/thank_you/components/MiniBanner.vue b/banners/thank_you/components/MiniBanner.vue
index c19e654d1..f93ffa9eb 100644
--- a/banners/thank_you/components/MiniBanner.vue
+++ b/banners/thank_you/components/MiniBanner.vue
@@ -41,11 +41,11 @@
 
 <script setup lang="ts">
 
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { computed, ref } from 'vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { computed, ref } from 'vue';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 
 interface Props {
 	showFireworks: boolean;
diff --git a/banners/thank_you/content/StatsBox.vue b/banners/thank_you/content/StatsBox.vue
index 8283a7337..79af421c0 100644
--- a/banners/thank_you/content/StatsBox.vue
+++ b/banners/thank_you/content/StatsBox.vue
@@ -30,7 +30,7 @@
 	</div>
 </template>
 <script setup lang="ts">
-import PeopleIcon from '../components/icons/PeopleIcon.vue';
 import HandIcon from '../components/icons/HandIcon.vue';
 import MoneyIcon from '../components/icons/MoneyIcon.vue';
+import PeopleIcon from '../components/icons/PeopleIcon.vue';
 </script>
diff --git a/banners/thank_you/content/lose/MiniBannerSlides.de.vue b/banners/thank_you/content/lose/MiniBannerSlides.de.vue
index 116118ef3..edff908bc 100644
--- a/banners/thank_you/content/lose/MiniBannerSlides.de.vue
+++ b/banners/thank_you/content/lose/MiniBannerSlides.de.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import HeartIcon from '@banners/thank_you/components/icons/HeartIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number;
diff --git a/banners/thank_you/content/lose/MiniBannerSlides.en.vue b/banners/thank_you/content/lose/MiniBannerSlides.en.vue
index 0df153625..79e7e64b9 100644
--- a/banners/thank_you/content/lose/MiniBannerSlides.en.vue
+++ b/banners/thank_you/content/lose/MiniBannerSlides.en.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import HeartIcon from '@banners/thank_you/components/icons/HeartIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number;
diff --git a/banners/thank_you/content/win/MiniBannerSlides.de.vue b/banners/thank_you/content/win/MiniBannerSlides.de.vue
index 4810bc04e..0b5d47e8d 100644
--- a/banners/thank_you/content/win/MiniBannerSlides.de.vue
+++ b/banners/thank_you/content/win/MiniBannerSlides.de.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import HeartIcon from '@banners/thank_you/components/icons/HeartIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number;
diff --git a/banners/thank_you/content/win/MiniBannerSlides.en.vue b/banners/thank_you/content/win/MiniBannerSlides.en.vue
index 9a254fed0..3c682644b 100644
--- a/banners/thank_you/content/win/MiniBannerSlides.en.vue
+++ b/banners/thank_you/content/win/MiniBannerSlides.en.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script setup lang="ts">
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import HeartIcon from '@banners/thank_you/components/icons/HeartIcon.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 
 interface Props {
 	currentSlide: number;
diff --git a/banners/thank_you/createTrackedURL.ts b/banners/thank_you/createTrackedURL.ts
index 39b42a598..de67d1b50 100644
--- a/banners/thank_you/createTrackedURL.ts
+++ b/banners/thank_you/createTrackedURL.ts
@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
+import { Locales } from '@src/domain/Locales';
 import { TrackingParameters } from '@src/domain/TrackingParameters';
 import { ImpressionCount } from '@src/utils/ImpressionCount';
-import { Locales } from '@src/domain/Locales';
 
 export const SUBSCRIBE_URL = 'https://www.wikimedia.de/mitglieder/';
 export const USE_OF_FUNDS_URL = 'https://spenden.wikimedia.de/use-of-funds/';
diff --git a/banners/thank_you/event_map.ts b/banners/thank_you/event_map.ts
index 645a6cf0d..b5564f10a 100644
--- a/banners/thank_you/event_map.ts
+++ b/banners/thank_you/event_map.ts
@@ -1,13 +1,13 @@
-import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
+import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent';
 import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
+import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export default new Map<string, TrackingEventConverterFactory>( [
 	[ NotShownEvent.EVENT_NAME, mapNotShownEvent ],
diff --git a/banners/thank_you/event_map.wpde.ts b/banners/thank_you/event_map.wpde.ts
index 5d871bc14..43ed8e5f1 100644
--- a/banners/thank_you/event_map.wpde.ts
+++ b/banners/thank_you/event_map.wpde.ts
@@ -1,7 +1,7 @@
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
 
 export default new Map( [
 	[ NotShownEvent.EVENT_NAME, 1 ],
diff --git a/banners/thank_you/settings.ts b/banners/thank_you/settings.ts
index b0e497ca4..8e4b7a161 100644
--- a/banners/thank_you/settings.ts
+++ b/banners/thank_you/settings.ts
@@ -1,5 +1,5 @@
-import { Integer } from '@src/utils/DynamicContent/formatters/Integer';
 import { ThankYouCampaignParameters } from '@src/domain/CampaignParameters';
+import { Integer } from '@src/utils/DynamicContent/formatters/Integer';
 
 export interface ThankYouSettings {
 	numberOfDonors: string;
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/banner_ctrl.ts b/banners/wpde_desktop/C24_WPDE_Desktop_00/banner_ctrl.ts
index 96bcddea3..24d0e9517 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/banner_ctrl.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/banner_ctrl.ts
@@ -3,21 +3,21 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import PageWPDE from '@src/page/PageWPDE';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
-import eventMap from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import eventMap from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryWpDe();
 const translator = new Translator( messages );
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/banner_var.ts b/banners/wpde_desktop/C24_WPDE_Desktop_00/banner_var.ts
index 3d0c63abf..723b50081 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/banner_var.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/banner_var.ts
@@ -3,21 +3,21 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import PageWPDE from '@src/page/PageWPDE';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
-import eventMap from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import eventMap from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryWpDe();
 const translator = new Translator( messages );
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/components/BannerCtrl.vue b/banners/wpde_desktop/C24_WPDE_Desktop_00/components/BannerCtrl.vue
index d36a65912..6a9ebb377 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/components/BannerCtrl.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/components/BannerCtrl.vue
@@ -93,40 +93,40 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import AlreadyDonatedContent from '../content/AlreadyDonatedContent.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import CustomAmountForm from '@src/components/DonationForm/Forms/CustomAmountForm.vue';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyForm from '@src/components/DonationForm/Forms/UpgradeToYearlyForm.vue';
-import CustomAmountForm from '@src/components/DonationForm/Forms/CustomAmountForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { createSubmittableCustomAmount } from '@src/components/DonationForm/StepControllers/SubmittableCustomAmount';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { createSubmittableCustomAmount } from '@src/components/DonationForm/StepControllers/SubmittableCustomAmount';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
+import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
 import SetMaybeLaterCookieImage from '@src/components/SetWPDECookieImage/SetMaybeLaterCookieImage.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import AlreadyDonatedContent from '../content/AlreadyDonatedContent.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/components/BannerVar.vue b/banners/wpde_desktop/C24_WPDE_Desktop_00/components/BannerVar.vue
index e38055737..0ad1f73fc 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/components/BannerVar.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/components/BannerVar.vue
@@ -114,45 +114,45 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import BannerText from '../content/BannerText.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import AlreadyDonatedContent from '../content/AlreadyDonatedContent.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import CustomAmountForm from '@src/components/DonationForm/Forms/CustomAmountForm.vue';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyForm from '@src/components/DonationForm/Forms/UpgradeToYearlyForm.vue';
-import CustomAmountForm from '@src/components/DonationForm/Forms/CustomAmountForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
+import { createSubmittableCustomAmount } from '@src/components/DonationForm/StepControllers/SubmittableCustomAmount';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { createSubmittableCustomAmount } from '@src/components/DonationForm/StepControllers/SubmittableCustomAmount';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue';
-import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
-import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import BankTransferLogo from '@src/components/PaymentLogos/BankTransferLogo.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
+import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
 import SepaLogo from '@src/components/PaymentLogos/SepaLogo.vue';
-import BankTransferLogo from '@src/components/PaymentLogos/BankTransferLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
+import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
 import SetMaybeLaterCookieImage from '@src/components/SetWPDECookieImage/SetMaybeLaterCookieImage.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import AlreadyDonatedContent from '../content/AlreadyDonatedContent.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/components/MainBanner.vue b/banners/wpde_desktop/C24_WPDE_Desktop_00/components/MainBanner.vue
index c5619037a..18853ee5b 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/components/MainBanner.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/components/MainBanner.vue
@@ -17,10 +17,10 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/content/BannerSlides.vue b/banners/wpde_desktop/C24_WPDE_Desktop_00/content/BannerSlides.vue
index 690410e1d..a9fa3d7c0 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/content/BannerSlides.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/content/BannerSlides.vue
@@ -35,11 +35,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/content/BannerText.vue b/banners/wpde_desktop/C24_WPDE_Desktop_00/content/BannerText.vue
index f9373f34b..540d50815 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/content/BannerText.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/content/BannerText.vue
@@ -23,10 +23,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/event_map.ts b/banners/wpde_desktop/C24_WPDE_Desktop_00/event_map.ts
index e3c9e98bf..ba7df3cf0 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/event_map.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/event_map.ts
@@ -1,6 +1,6 @@
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
 
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/form_items.ts b/banners/wpde_desktop/C24_WPDE_Desktop_00/form_items.ts
index ccf13b3f5..ca4dd4c14 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/form_items.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_00/messages.ts b/banners/wpde_desktop/C24_WPDE_Desktop_00/messages.ts
index fa42db7ef..03d3a5126 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_00/messages.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_00/messages.ts
@@ -1,12 +1,12 @@
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
-import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/banner_ctrl.ts b/banners/wpde_desktop/C24_WPDE_Desktop_01/banner_ctrl.ts
index 96bcddea3..24d0e9517 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/banner_ctrl.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/banner_ctrl.ts
@@ -3,21 +3,21 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import PageWPDE from '@src/page/PageWPDE';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
-import eventMap from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import eventMap from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryWpDe();
 const translator = new Translator( messages );
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/banner_var.ts b/banners/wpde_desktop/C24_WPDE_Desktop_01/banner_var.ts
index 3d0c63abf..723b50081 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/banner_var.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/banner_var.ts
@@ -3,21 +3,21 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles_var.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import PageWPDE from '@src/page/PageWPDE';
-import TranslationPlugin from '@src/TranslationPlugin';
 import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
-import eventMap from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import eventMap from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryWpDe();
 const translator = new Translator( messages );
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerCtrl.vue b/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerCtrl.vue
index e92353d6b..374eeadc9 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerCtrl.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerCtrl.vue
@@ -105,41 +105,41 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerText from '../content/BannerText.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
-import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import BankTransferLogo from '@src/components/PaymentLogos/BankTransferLogo.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
+import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
 import SepaLogo from '@src/components/PaymentLogos/SepaLogo.vue';
-import BankTransferLogo from '@src/components/PaymentLogos/BankTransferLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
+import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
 import SetMaybeLaterCookieImage from '@src/components/SetWPDECookieImage/SetMaybeLaterCookieImage.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerVar.vue b/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerVar.vue
index c01fdbcee..86e13f067 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerVar.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerVar.vue
@@ -105,43 +105,43 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { inject, ref, watch } from 'vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import MainBanner from './MainBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import MainDonationFormTransactionFees from '@src/components/DonationForm/Forms/MainDonationFormTransactionFees.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerText from '../content/BannerText.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import MainDonationFormTransactionFees from '@src/components/DonationForm/Forms/MainDonationFormTransactionFees.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import { Tracker } from '@src/tracking/Tracker';
-import { CoverTransactionFeesEvent } from '@src/tracking/events/CoverTransactionFeesEvent';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
-import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
-import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
-import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
+import BankTransferLogo from '@src/components/PaymentLogos/BankTransferLogo.vue';
 import MastercardLogo from '@src/components/PaymentLogos/MastercardLogo.vue';
+import PayPalLogo from '@src/components/PaymentLogos/PayPalLogo.vue';
 import SepaLogo from '@src/components/PaymentLogos/SepaLogo.vue';
-import BankTransferLogo from '@src/components/PaymentLogos/BankTransferLogo.vue';
+import VisaLogo from '@src/components/PaymentLogos/VisaLogo.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
+import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
 import SetMaybeLaterCookieImage from '@src/components/SetWPDECookieImage/SetMaybeLaterCookieImage.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CoverTransactionFeesEvent } from '@src/tracking/events/CoverTransactionFeesEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import MainBanner from './MainBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Main = 'wmde-banner-wrapper--main',
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/components/MainBanner.vue b/banners/wpde_desktop/C24_WPDE_Desktop_01/components/MainBanner.vue
index c5619037a..18853ee5b 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/components/MainBanner.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/components/MainBanner.vue
@@ -17,10 +17,10 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { computed, nextTick, ref } from 'vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 interface Props {
 	bannerState: BannerStates;
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/content/BannerSlides.vue b/banners/wpde_desktop/C24_WPDE_Desktop_01/content/BannerSlides.vue
index b43c3c38c..52c09c4d5 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/content/BannerSlides.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/content/BannerSlides.vue
@@ -35,11 +35,11 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, onUnmounted } from 'vue';
+import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
 import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
-import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/content/BannerText.vue b/banners/wpde_desktop/C24_WPDE_Desktop_01/content/BannerText.vue
index f35e12ac6..ca579b4a1 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/content/BannerText.vue
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/content/BannerText.vue
@@ -23,10 +23,10 @@
 
 <script setup lang="ts">
 import { inject, onMounted, onUnmounted } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import InfoIcon from '@src/components/Icons/InfoIcon.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import InfoIcon from '@src/components/Icons/InfoIcon.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 const {
 	currentDayName,
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/event_map.ts b/banners/wpde_desktop/C24_WPDE_Desktop_01/event_map.ts
index 86d0b8e0e..c33757d01 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/event_map.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/event_map.ts
@@ -1,9 +1,9 @@
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CoverTransactionFeesEvent } from '@src/tracking/events/CoverTransactionFeesEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
-import { CoverTransactionFeesEvent } from '@src/tracking/events/CoverTransactionFeesEvent';
 
 export default new Map( [
 	[ CloseEvent.EVENT_NAME, 0.1 ],
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/form_items.ts b/banners/wpde_desktop/C24_WPDE_Desktop_01/form_items.ts
index ccf13b3f5..ca4dd4c14 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/form_items.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/wpde_desktop/C24_WPDE_Desktop_01/messages.ts b/banners/wpde_desktop/C24_WPDE_Desktop_01/messages.ts
index 59542effc..49567d580 100644
--- a/banners/wpde_desktop/C24_WPDE_Desktop_01/messages.ts
+++ b/banners/wpde_desktop/C24_WPDE_Desktop_01/messages.ts
@@ -1,12 +1,12 @@
+import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
-import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
-import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.de';
+import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_00/banner_ctrl.ts b/banners/wpde_mobile/C24_WPDE_Mobile_00/banner_ctrl.ts
index 83243b966..876fee8c2 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_00/banner_ctrl.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_00/banner_ctrl.ts
@@ -3,22 +3,22 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import PageWPDE from '@src/page/PageWPDE';
-import TranslationPlugin from '@src/TranslationPlugin';
-import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
 import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
-import eventMap from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import eventMap from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryWpDe();
 const translator = new Translator( messages );
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_00/banner_var.ts b/banners/wpde_mobile/C24_WPDE_Mobile_00/banner_var.ts
index d3c852064..f8d832c7b 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_00/banner_var.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_00/banner_var.ts
@@ -3,22 +3,22 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import PageWPDE from '@src/page/PageWPDE';
-import TranslationPlugin from '@src/TranslationPlugin';
-import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
 import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
-import eventMap from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import eventMap from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryWpDe();
 const translator = new Translator( messages );
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerCtrl.vue b/banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerCtrl.vue
index 480b0845f..2a2ff9bed 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerCtrl.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerCtrl.vue
@@ -71,38 +71,38 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerVar.vue b/banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerVar.vue
index b72c5d69f..b52478c50 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerVar.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerVar.vue
@@ -67,37 +67,37 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBannerVar from './MiniBannerVar.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlidesVar from '../content/BannerSlidesVar.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
+import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
-import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBannerVar from './MiniBannerVar.vue';
+import BannerSlidesVar from '../content/BannerSlidesVar.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_00/content/BannerSlides.vue b/banners/wpde_mobile/C24_WPDE_Mobile_00/content/BannerSlides.vue
index 8f15b7e93..d0508c1fd 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_00/content/BannerSlides.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_00/content/BannerSlides.vue
@@ -32,10 +32,10 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject } from 'vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_00/content/BannerSlidesVar.vue b/banners/wpde_mobile/C24_WPDE_Mobile_00/content/BannerSlidesVar.vue
index e56a0eef0..ab81d0504 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_00/content/BannerSlidesVar.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_00/content/BannerSlidesVar.vue
@@ -32,10 +32,10 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject } from 'vue';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	currentSlide: number
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_00/event_map.ts b/banners/wpde_mobile/C24_WPDE_Mobile_00/event_map.ts
index ea0e58a98..30b9a018c 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_00/event_map.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_00/event_map.ts
@@ -1,9 +1,9 @@
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { ShownEvent } from '@src/tracking/events/ShownEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { ShownEvent } from '@src/tracking/events/ShownEvent';
 
 export default new Map( [
 	[ MobileMiniBannerExpandedEvent.EVENT_NAME, 1 ],
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_00/form_items.ts b/banners/wpde_mobile/C24_WPDE_Mobile_00/form_items.ts
index a3c657221..3b8ce14d8 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_00/form_items.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_00/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_00/messages.ts b/banners/wpde_mobile/C24_WPDE_Mobile_00/messages.ts
index a9655b585..1d325b96a 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_00/messages.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_00/messages.ts
@@ -1,11 +1,11 @@
+import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
-import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_ctrl.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_ctrl.ts
index 83243b966..876fee8c2 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_ctrl.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_ctrl.ts
@@ -3,22 +3,22 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerCtrl.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import PageWPDE from '@src/page/PageWPDE';
-import TranslationPlugin from '@src/TranslationPlugin';
-import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
 import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
-import eventMap from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerCtrl.vue';
+import eventMap from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryWpDe();
 const translator = new Translator( messages );
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_var.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_var.ts
index d3c852064..f8d832c7b 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_var.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_var.ts
@@ -3,22 +3,22 @@ import { createVueApp } from '@src/createVueApp';
 import './styles/styles.scss';
 
 import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import Banner from './components/BannerVar.vue';
-import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
-import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { createFormActions } from '@src/createFormActions';
+import DynamicTextPlugin from '@src/DynamicTextPlugin';
 import PageWPDE from '@src/page/PageWPDE';
-import TranslationPlugin from '@src/TranslationPlugin';
-import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
 import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
-import eventMap from './event_map';
+import TranslationPlugin from '@src/TranslationPlugin';
 import { Translator } from '@src/Translator';
-import DynamicTextPlugin from '@src/DynamicTextPlugin';
+import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
 import { LocalImpressionCount } from '@src/utils/LocalImpressionCount';
+import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller';
+import { WindowResizeHandler } from '@src/utils/ResizeHandler';
+import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import { WindowTimer } from '@src/utils/Timer';
+import Banner from './components/BannerVar.vue';
+import eventMap from './event_map';
 import { createFormItems } from './form_items';
-import { createFormActions } from '@src/createFormActions';
 import messages from './messages';
-import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe';
-import { WindowTimer } from '@src/utils/Timer';
 
 const localeFactory = new LocaleFactoryWpDe();
 const translator = new Translator( messages );
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.vue
index 9a2291096..14cc205b1 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.vue
@@ -91,39 +91,39 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBanner.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerText.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlides.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
 import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
-import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBanner.vue';
+import BannerSlides from '../content/BannerSlides.vue';
+import BannerText from '../content/BannerText.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.vue
index 8a2fb018f..b21118e09 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.vue
@@ -91,39 +91,39 @@
 </template>
 
 <script setup lang="ts">
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { computed, inject, ref, watch } from 'vue';
-import FullPageBanner from './FullPageBanner.vue';
-import MiniBanner from './MiniBannerVar.vue';
-import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
-import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
-import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import BannerText from '../content/BannerTextVar.vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
-import BannerSlides from '../content/BannerSlidesVar.vue';
-import BannerFooter from '@src/components/Footer/BannerFooter.vue';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
 import SetAlreadyDonatedCookieImage from '@src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue';
+import SetCookieImage from '@src/components/SetWPDECookieImage/SetCookieImage.vue';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import WMDEFundsForwardingDE from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingDE.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import FullPageBanner from './FullPageBanner.vue';
+import MiniBanner from './MiniBannerVar.vue';
+import BannerSlides from '../content/BannerSlidesVar.vue';
+import BannerText from '../content/BannerTextVar.vue';
 
 enum ContentStates {
 	Mini = 'wmde-banner-wrapper--mini',
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlides.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlides.vue
index 79c51b5f0..8ab9a4d29 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlides.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlides.vue
@@ -33,12 +33,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlidesVar.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlidesVar.vue
index 1e8b78623..31fc3d2df 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlidesVar.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlidesVar.vue
@@ -33,12 +33,12 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject, onMounted, watch } from 'vue';
-import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
+import KeenSliderSlide from '@src/components/Slider/KeenSliderSlide.vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerText.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerText.vue
index f3131e2ed..065328b29 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerText.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerText.vue
@@ -21,9 +21,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerTextVar.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerTextVar.vue
index 42d80a9f1..dcbd39680 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerTextVar.vue
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerTextVar.vue
@@ -21,9 +21,9 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import AnimatedText from '@src/components/AnimatedText/AnimatedText.vue';
 import { useLiveDateAndTime } from '@src/components/composables/useLiveDateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	playLiveText: boolean;
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/event_map.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/event_map.ts
index ea0e58a98..30b9a018c 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/event_map.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/event_map.ts
@@ -1,9 +1,9 @@
-import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { ShownEvent } from '@src/tracking/events/ShownEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { ShownEvent } from '@src/tracking/events/ShownEvent';
 
 export default new Map( [
 	[ MobileMiniBannerExpandedEvent.EVENT_NAME, 1 ],
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/form_items.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/form_items.ts
index a3c657221..3b8ce14d8 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/form_items.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/form_items.ts
@@ -1,9 +1,9 @@
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems {
 	return new FormItemsBuilder( translations, amountFormatter )
diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/messages.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/messages.ts
index b9601b241..e19a09903 100644
--- a/banners/wpde_mobile/C24_WPDE_Mobile_01/messages.ts
+++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/messages.ts
@@ -1,11 +1,11 @@
+import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de';
-import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
-import { TranslationMessages } from '@src/Translator';
+import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
 import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de';
-import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
-import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de';
 import FooterDe from '@src/components/Footer/messages/Footer.de';
-import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de';
+import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de';
+import { TranslationMessages } from '@src/Translator';
+import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de';
 
 const messages: TranslationMessages = {
 	...CustomAmountFormDe,
diff --git a/dashboard/components/BannerActions.vue b/dashboard/components/BannerActions.vue
index 2f1306a1d..fc886286c 100644
--- a/dashboard/components/BannerActions.vue
+++ b/dashboard/components/BannerActions.vue
@@ -63,17 +63,17 @@
 </template>
 
 <script setup lang="ts">
-import { computed, Ref, ref } from 'vue';
-import type { Banner, Campaign } from '../../webpack/campaign_config_types';
-import IconPreview from './IconPreview.vue';
-import IconEdit from './IconEdit.vue';
-import IconCopy from './IconCopy.vue';
-import IconBuild from './IconBuild.vue';
-import { relevantTime } from '../relevant_time';
-import { CompileInfo } from '../util';
+import { computed, ref, Ref } from 'vue';
 import LoadingSpinner from './BuildingAnimation.vue';
 import CopyingAnimation from './CopyingAnimation.vue';
+import IconBuild from './IconBuild.vue';
+import IconCopy from './IconCopy.vue';
 import IconDarkMode from './IconDarkMode.vue';
+import IconEdit from './IconEdit.vue';
+import IconPreview from './IconPreview.vue';
+import type { Banner, Campaign } from '../../webpack/campaign_config_types';
+import { relevantTime } from '../relevant_time';
+import { CompileInfo } from '../util';
 
 interface Props {
 	banner: Banner;
diff --git a/dashboard/components/BannerCampaign.vue b/dashboard/components/BannerCampaign.vue
index fae141f16..9f7e5069d 100644
--- a/dashboard/components/BannerCampaign.vue
+++ b/dashboard/components/BannerCampaign.vue
@@ -83,16 +83,16 @@
 
 <script setup lang="ts">
 
-import IconShutterbug from './IconShutterbug.vue';
 import BannerActions from './BannerActions.vue';
-import DeviceMobile from './DeviceMobile.vue';
 import DeviceDesktop from './DeviceDesktop.vue';
+import DeviceMobile from './DeviceMobile.vue';
+import DevicePad from './DevicePad.vue';
 import IconCommand from './IconCommand.vue';
 import IconInfo from './IconInfo.vue';
-import DevicePad from './DevicePad.vue';
+import IconPullRequest from './IconPullRequest.vue';
+import IconShutterbug from './IconShutterbug.vue';
 import { Campaign } from '../../webpack/campaign_config_types';
 import { CompileInfo } from '../util';
-import IconPullRequest from './IconPullRequest.vue';
 
 interface Props {
 	campaign: Campaign,
diff --git a/dashboard/components/DevDashboard.vue b/dashboard/components/DevDashboard.vue
index 4e9747826..a68bffa9a 100644
--- a/dashboard/components/DevDashboard.vue
+++ b/dashboard/components/DevDashboard.vue
@@ -49,12 +49,12 @@
 </template>
 
 <script setup lang="ts">
-import type { Campaign, CampaignConfig } from '../../webpack/campaign_config_types';
+import { computed, onMounted, ref } from 'vue';
+import BannerCampaign from './BannerCampaign.vue';
 import IconGit from './IconGit.vue';
 import IconRefresh from './IconRefresh.vue';
+import type { Campaign, CampaignConfig } from '../../webpack/campaign_config_types';
 import { CompileInfo, parseCompileInfo } from '../util';
-import { computed, onMounted, ref } from 'vue';
-import BannerCampaign from './BannerCampaign.vue';
 
 const props = defineProps<{ campaigns: CampaignConfig, gitBranch: string }>();
 let branchName = ref<string>( props.gitBranch );
diff --git a/package-lock.json b/package-lock.json
index 6f0bbfaba..8341d3f17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,8 @@
         "css-loader": "^7.1.2",
         "eslint": "^8.57.0",
         "eslint-config-wikimedia": "^0.28.2",
+        "eslint-import-resolver-typescript": "^3.6.3",
+        "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-jsdoc": "^50.4.3",
         "eslint-plugin-unicorn": "^56.0.0",
         "eslint-plugin-vue": "^9.29.1",
@@ -1176,6 +1178,16 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@nolyfill/is-core-module": {
+      "version": "1.0.39",
+      "resolved": "https://registry.npmjs.org/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz",
+      "integrity": "sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.4.0"
+      }
+    },
     "node_modules/@one-ini/wasm": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz",
@@ -1717,6 +1729,13 @@
         "win32"
       ]
     },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@rushstack/eslint-patch": {
       "version": "1.10.4",
       "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.10.4.tgz",
@@ -2014,6 +2033,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/mime": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
@@ -3650,6 +3676,27 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/array-includes": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -3660,6 +3707,65 @@
         "node": ">=8"
       }
     },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/arraybuffer.prototype.slice": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
@@ -5235,6 +5341,16 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      }
+    },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -5582,6 +5698,92 @@
         "node": "*"
       }
     },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-typescript": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.3.tgz",
+      "integrity": "sha512-ud9aw4szY9cCT1EWWdGv1L1XR6hh2PaRWif0j2QjQ0pgTY/69iw+W0Z4qZv5wHahOl8isEr+k/JnyAqNQkLkIA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@nolyfill/is-core-module": "1.0.39",
+        "debug": "^4.3.5",
+        "enhanced-resolve": "^5.15.0",
+        "eslint-module-utils": "^2.8.1",
+        "fast-glob": "^3.3.2",
+        "get-tsconfig": "^4.7.5",
+        "is-bun-module": "^1.0.2",
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "eslint-plugin-import": "*",
+        "eslint-plugin-import-x": "*"
+      },
+      "peerDependenciesMeta": {
+        "eslint-plugin-import": {
+          "optional": true
+        },
+        "eslint-plugin-import-x": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
     "node_modules/eslint-plugin-compat": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.2.0.tgz",
@@ -5626,6 +5828,97 @@
         "eslint": ">=8"
       }
     },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.12.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/eslint-plugin-jest": {
       "version": "28.8.3",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.3.tgz",
@@ -7486,6 +7779,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-bun-module": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.2.1.tgz",
+      "integrity": "sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.6.3"
+      }
+    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -9067,6 +9370,58 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
+      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -12328,6 +12683,32 @@
         }
       }
     },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
diff --git a/package.json b/package.json
index 1b811612b..606c2deb7 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,8 @@
     "css-loader": "^7.1.2",
     "eslint": "^8.57.0",
     "eslint-config-wikimedia": "^0.28.2",
+    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsdoc": "^50.4.3",
     "eslint-plugin-unicorn": "^56.0.0",
     "eslint-plugin-vue": "^9.29.1",
diff --git a/src/DynamicTextPlugin.ts b/src/DynamicTextPlugin.ts
index cc6c20d59..547c3a69d 100644
--- a/src/DynamicTextPlugin.ts
+++ b/src/DynamicTextPlugin.ts
@@ -1,9 +1,9 @@
 import { App } from 'vue';
+import { CampaignParameters } from '@src/domain/CampaignParameters';
 import { Translator } from '@src/Translator';
+import DynamicCampaignText from '@src/utils/DynamicContent/DynamicCampaignText';
 import { Formatters } from '@src/utils/DynamicContent/Formatters';
-import { CampaignParameters } from '@src/domain/CampaignParameters';
 import { ImpressionCount } from '@src/utils/ImpressionCount';
-import DynamicCampaignText from '@src/utils/DynamicContent/DynamicCampaignText';
 
 interface DynamicCampaignTextOptions {
     date: Date;
diff --git a/src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue b/src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue
index b1e2f80b7..5d557a38f 100644
--- a/src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue
+++ b/src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue
@@ -25,10 +25,10 @@
 
 <script setup lang="ts">
 
-import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { inject, ref, watch } from 'vue';
-import { Tracker } from '@src/tracking/Tracker';
+import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
 import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 
 interface Props {
 	isVisible: boolean;
diff --git a/src/components/BannerConductor/BannerConductor.vue b/src/components/BannerConductor/BannerConductor.vue
index db3c1d4e7..f7fcdde67 100644
--- a/src/components/BannerConductor/BannerConductor.vue
+++ b/src/components/BannerConductor/BannerConductor.vue
@@ -18,20 +18,20 @@
 
 <script setup lang="ts">
 
-import { Page } from '@src/page/Page';
 import { inject, nextTick, onMounted, ref } from 'vue';
-import { BannerConfig } from '@src/domain/BannerConfig';
-import { ResizeHandler } from '@src/utils/ResizeHandler';
-import { newStateFactory } from '@src/components/BannerConductor/StateMachine/states/StateFactory';
 import { newBannerStateMachine } from '@src/components/BannerConductor/StateMachine/BannerStateMachine';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
-import { Vector2 } from '@src/utils/Vector2';
-import { ImpressionCount } from '@src/utils/ImpressionCount';
+import { newStateFactory } from '@src/components/BannerConductor/StateMachine/states/StateFactory';
+import { BannerConfig } from '@src/domain/BannerConfig';
+import { Page } from '@src/page/Page';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { Tracker } from '@src/tracking/Tracker';
 import { TrackingEvent } from '@src/tracking/TrackingEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { ImpressionCount } from '@src/utils/ImpressionCount';
+import { ResizeHandler } from '@src/utils/ResizeHandler';
 import { Timer } from '@src/utils/Timer';
+import { Vector2 } from '@src/utils/Vector2';
 
 interface Props {
 	page: Page,
diff --git a/src/components/BannerConductor/FallbackBannerConductor.vue b/src/components/BannerConductor/FallbackBannerConductor.vue
index 40c01721d..35a6842a3 100644
--- a/src/components/BannerConductor/FallbackBannerConductor.vue
+++ b/src/components/BannerConductor/FallbackBannerConductor.vue
@@ -18,21 +18,21 @@
 
 <script setup lang="ts">
 
-import { Page } from '@src/page/Page';
 import { inject, nextTick, onMounted, ref, shallowRef } from 'vue';
-import { BannerConfig } from '@src/domain/BannerConfig';
-import { ResizeHandler } from '@src/utils/ResizeHandler';
-import { newStateFactory } from '@src/components/BannerConductor/StateMachine/states/StateFactory';
 import { newBannerStateMachine } from '@src/components/BannerConductor/StateMachine/BannerStateMachine';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
-import { Vector2 } from '@src/utils/Vector2';
-import { ImpressionCount } from '@src/utils/ImpressionCount';
+import { newStateFactory } from '@src/components/BannerConductor/StateMachine/states/StateFactory';
+import { BannerConfig } from '@src/domain/BannerConfig';
+import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { Page } from '@src/page/Page';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { Tracker } from '@src/tracking/Tracker';
 import { TrackingEvent, TrackingFeatureName } from '@src/tracking/TrackingEvent';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { ImpressionCount } from '@src/utils/ImpressionCount';
+import { ResizeHandler } from '@src/utils/ResizeHandler';
 import { Timer } from '@src/utils/Timer';
+import { Vector2 } from '@src/utils/Vector2';
 
 interface Props {
 	page: Page,
diff --git a/src/components/BannerConductor/StateMachine/BannerStateMachine.ts b/src/components/BannerConductor/StateMachine/BannerStateMachine.ts
index e8034d3f9..d11b187bc 100644
--- a/src/components/BannerConductor/StateMachine/BannerStateMachine.ts
+++ b/src/components/BannerConductor/StateMachine/BannerStateMachine.ts
@@ -1,6 +1,6 @@
-import { StateMachine } from '@src/domain/StateMachine/StateMachine';
 import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { ReactiveProperty } from '@src/domain/StateMachine/ReactiveProperty';
+import { StateMachine } from '@src/domain/StateMachine/StateMachine';
 
 export class BannerStateMachine implements StateMachine<BannerState> {
 	public currentState: ReactiveProperty<BannerState>;
diff --git a/src/components/BannerConductor/StateMachine/states/BannerState.ts b/src/components/BannerConductor/StateMachine/states/BannerState.ts
index 4cd24f3e3..7d9158bad 100644
--- a/src/components/BannerConductor/StateMachine/states/BannerState.ts
+++ b/src/components/BannerConductor/StateMachine/states/BannerState.ts
@@ -1,5 +1,5 @@
-import { StateMachineState } from '@src/domain/StateMachine/StateMachineState';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { StateMachineState } from '@src/domain/StateMachine/StateMachineState';
 
 export abstract class BannerState implements StateMachineState<BannerStates> {
 	public abstract stateName: BannerStates;
diff --git a/src/components/BannerConductor/StateMachine/states/ClosedState.ts b/src/components/BannerConductor/StateMachine/states/ClosedState.ts
index 0508bbdbf..225e6302b 100644
--- a/src/components/BannerConductor/StateMachine/states/ClosedState.ts
+++ b/src/components/BannerConductor/StateMachine/states/ClosedState.ts
@@ -1,9 +1,9 @@
-import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { Page } from '@src/page/Page';
 import { Tracker } from '@src/tracking/Tracker';
-import { ResizeHandler } from '@src/utils/ResizeHandler';
 import { TrackingEvent } from '@src/tracking/TrackingEvent';
+import { ResizeHandler } from '@src/utils/ResizeHandler';
 import { Timer } from '@src/utils/Timer';
 
 export class ClosedState extends BannerState {
diff --git a/src/components/BannerConductor/StateMachine/states/InitialState.ts b/src/components/BannerConductor/StateMachine/states/InitialState.ts
index 5a17a4f4f..1de6cba1f 100644
--- a/src/components/BannerConductor/StateMachine/states/InitialState.ts
+++ b/src/components/BannerConductor/StateMachine/states/InitialState.ts
@@ -1,5 +1,5 @@
-import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 
 export class InitialState extends BannerState {
 	public readonly stateName: BannerStates = BannerStates.Initial;
diff --git a/src/components/BannerConductor/StateMachine/states/NotShownState.ts b/src/components/BannerConductor/StateMachine/states/NotShownState.ts
index 720a873d8..c8636241e 100644
--- a/src/components/BannerConductor/StateMachine/states/NotShownState.ts
+++ b/src/components/BannerConductor/StateMachine/states/NotShownState.ts
@@ -1,9 +1,9 @@
-import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
 import { Page } from '@src/page/Page';
-import { Tracker } from '@src/tracking/Tracker';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { ResizeHandler } from '@src/utils/ResizeHandler';
 import { Timer } from '@src/utils/Timer';
 
diff --git a/src/components/BannerConductor/StateMachine/states/PendingState.ts b/src/components/BannerConductor/StateMachine/states/PendingState.ts
index 6df085fd5..6df0a5d82 100644
--- a/src/components/BannerConductor/StateMachine/states/PendingState.ts
+++ b/src/components/BannerConductor/StateMachine/states/PendingState.ts
@@ -1,5 +1,5 @@
-import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { Page } from '@src/page/Page';
 import { Timer } from '@src/utils/Timer';
 
diff --git a/src/components/BannerConductor/StateMachine/states/ShowingState.ts b/src/components/BannerConductor/StateMachine/states/ShowingState.ts
index 5f1915f4f..f8cbffb4a 100644
--- a/src/components/BannerConductor/StateMachine/states/ShowingState.ts
+++ b/src/components/BannerConductor/StateMachine/states/ShowingState.ts
@@ -1,5 +1,5 @@
-import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { Page } from '@src/page/Page';
 import { Timer } from '@src/utils/Timer';
 
diff --git a/src/components/BannerConductor/StateMachine/states/StateFactory.ts b/src/components/BannerConductor/StateMachine/states/StateFactory.ts
index faeeca5b1..85c29dc35 100644
--- a/src/components/BannerConductor/StateMachine/states/StateFactory.ts
+++ b/src/components/BannerConductor/StateMachine/states/StateFactory.ts
@@ -1,17 +1,17 @@
 import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
-import { PendingState } from '@src/components/BannerConductor/StateMachine/states/PendingState';
-import { Page } from '@src/page/Page';
+import { ClosedState } from '@src/components/BannerConductor/StateMachine/states/ClosedState';
+import { InitialState } from '@src/components/BannerConductor/StateMachine/states/InitialState';
 import { NotShownState } from '@src/components/BannerConductor/StateMachine/states/NotShownState';
-import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
-import { Tracker } from '@src/tracking/Tracker';
-import { ResizeHandler } from '@src/utils/ResizeHandler';
+import { PendingState } from '@src/components/BannerConductor/StateMachine/states/PendingState';
 import { ShowingState } from '@src/components/BannerConductor/StateMachine/states/ShowingState';
-import { BannerConfig } from '@src/domain/BannerConfig';
 import { VisibleState } from '@src/components/BannerConductor/StateMachine/states/VisibleState';
-import { ImpressionCount } from '@src/utils/ImpressionCount';
-import { ClosedState } from '@src/components/BannerConductor/StateMachine/states/ClosedState';
-import { InitialState } from '@src/components/BannerConductor/StateMachine/states/InitialState';
+import { BannerConfig } from '@src/domain/BannerConfig';
+import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { Page } from '@src/page/Page';
+import { Tracker } from '@src/tracking/Tracker';
 import { TrackingEvent, TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { ImpressionCount } from '@src/utils/ImpressionCount';
+import { ResizeHandler } from '@src/utils/ResizeHandler';
 import { Timer } from '@src/utils/Timer';
 
 export class StateFactory {
diff --git a/src/components/BannerConductor/StateMachine/states/VisibleState.ts b/src/components/BannerConductor/StateMachine/states/VisibleState.ts
index 1d119b982..836c4c1f1 100644
--- a/src/components/BannerConductor/StateMachine/states/VisibleState.ts
+++ b/src/components/BannerConductor/StateMachine/states/VisibleState.ts
@@ -1,10 +1,10 @@
-import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { Page } from '@src/page/Page';
-import { ImpressionCount } from '@src/utils/ImpressionCount';
-import { Tracker } from '@src/tracking/Tracker';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import { ImpressionCount } from '@src/utils/ImpressionCount';
 
 export class VisibleState extends BannerState {
 	public readonly stateName: BannerStates = BannerStates.Visible;
diff --git a/src/components/DonationForm/Forms/AddressTypeButtonForm.vue b/src/components/DonationForm/Forms/AddressTypeButtonForm.vue
index a0c9fb619..74d2d437b 100644
--- a/src/components/DonationForm/Forms/AddressTypeButtonForm.vue
+++ b/src/components/DonationForm/Forms/AddressTypeButtonForm.vue
@@ -42,14 +42,14 @@ export default {
 </script>
 
 <script setup lang="ts">
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import { computed, inject } from 'vue';
-import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { Translator } from '@src/Translator';
-import { Tracker } from '@src/tracking/Tracker';
 import { useFormStepShownEvent } from '@src/components/DonationForm/Forms/useFormStepShownEvent';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import { Tracker } from '@src/tracking/Tracker';
+import { Translator } from '@src/Translator';
+import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 interface Props {
 	isCurrent: boolean
diff --git a/src/components/DonationForm/Forms/AddressTypeForm.vue b/src/components/DonationForm/Forms/AddressTypeForm.vue
index 2618ea778..0b5dacc0e 100644
--- a/src/components/DonationForm/Forms/AddressTypeForm.vue
+++ b/src/components/DonationForm/Forms/AddressTypeForm.vue
@@ -44,18 +44,18 @@ export default {
 </script>
 
 <script setup lang="ts">
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import { computed, inject } from 'vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import { isValidOrUnset } from '@src/components/DonationForm/Forms/isValidOrUnset';
+import { useFormStepShownEvent } from '@src/components/DonationForm/Forms/useFormStepShownEvent';
 import SelectGroup from '@src/components/DonationForm/SubComponents/SelectGroup.vue';
-import { computed, inject } from 'vue';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import { Tracker } from '@src/tracking/Tracker';
+import { Translator } from '@src/Translator';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { Validity } from '@src/utils/FormModel/Validity';
-import { Translator } from '@src/Translator';
-import { Tracker } from '@src/tracking/Tracker';
-import { useFormStepShownEvent } from '@src/components/DonationForm/Forms/useFormStepShownEvent';
 
 interface Props {
 	isCurrent: boolean
diff --git a/src/components/DonationForm/Forms/CustomAmountForm.vue b/src/components/DonationForm/Forms/CustomAmountForm.vue
index a5b9a261c..6ee5ab3d5 100644
--- a/src/components/DonationForm/Forms/CustomAmountForm.vue
+++ b/src/components/DonationForm/Forms/CustomAmountForm.vue
@@ -60,17 +60,17 @@ export default {
 
 <script setup lang="ts">
 import { computed, inject, ref } from 'vue';
-import { parseFloatFromFormattedString } from '@src/utils/parseFloatFromFormattedString';
-import { validateAmount } from '@src/validation/validateAmount';
-import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
-import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { isValidOrUnset } from '@src/components/DonationForm/Forms/isValidOrUnset';
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
-import { amountValidityMessageKey } from '@src/utils/amountValidityMessageKey';
-import { Tracker } from '@src/tracking/Tracker';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
+import { isValidOrUnset } from '@src/components/DonationForm/Forms/isValidOrUnset';
 import { useFormStepShownEvent } from '@src/components/DonationForm/Forms/useFormStepShownEvent';
+import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { amountValidityMessageKey } from '@src/utils/amountValidityMessageKey';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
+import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
+import { parseFloatFromFormattedString } from '@src/utils/parseFloatFromFormattedString';
+import { validateAmount } from '@src/validation/validateAmount';
 
 interface Props {
 	isCurrent: boolean
diff --git a/src/components/DonationForm/Forms/MainDonationForm.vue b/src/components/DonationForm/Forms/MainDonationForm.vue
index 0bde619c4..9f3210c94 100644
--- a/src/components/DonationForm/Forms/MainDonationForm.vue
+++ b/src/components/DonationForm/Forms/MainDonationForm.vue
@@ -76,16 +76,16 @@ export default {
 <script setup lang="ts">
 
 import { inject, ref } from 'vue';
-import SelectGroup from '@src/components/DonationForm/SubComponents/SelectGroup.vue';
-import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { isValidOrUnset } from '@src/components/DonationForm/Forms/isValidOrUnset';
+import MainDonationFormButtonMultiStep from '@src/components/DonationForm/Forms/MainDonationFormButtonMultiStep.vue';
 import SelectCustomAmount from '@src/components/DonationForm/SubComponents/SelectCustomAmount.vue';
+import SelectGroup from '@src/components/DonationForm/SubComponents/SelectGroup.vue';
 import SmsBox from '@src/components/DonationForm/SubComponents/SmsBox.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { newDonationFormValidator } from '@src/validation/DonationFormValidator';
 import { amountValidityMessageKey } from '@src/utils/amountValidityMessageKey';
-import { isValidOrUnset } from '@src/components/DonationForm/Forms/isValidOrUnset';
 import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
-import MainDonationFormButtonMultiStep from '@src/components/DonationForm/Forms/MainDonationFormButtonMultiStep.vue';
+import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
+import { newDonationFormValidator } from '@src/validation/DonationFormValidator';
 
 interface Props {
 	showErrorScrollLink?: boolean;
diff --git a/src/components/DonationForm/Forms/MainDonationFormButtonMultiStep.vue b/src/components/DonationForm/Forms/MainDonationFormButtonMultiStep.vue
index d19f024c2..2f435fc82 100644
--- a/src/components/DonationForm/Forms/MainDonationFormButtonMultiStep.vue
+++ b/src/components/DonationForm/Forms/MainDonationFormButtonMultiStep.vue
@@ -6,10 +6,10 @@
 
 <script setup lang="ts">
 import { computed, inject } from 'vue';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { useFormModel } from '@src/components/composables/useFormModel';
 import { Translator } from '@src/Translator';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 const formModel = useFormModel();
 const translator = inject<Translator>( 'translator' );
diff --git a/src/components/DonationForm/Forms/MainDonationFormButtonMultiStepAmount.vue b/src/components/DonationForm/Forms/MainDonationFormButtonMultiStepAmount.vue
index b72240f27..5a9041033 100644
--- a/src/components/DonationForm/Forms/MainDonationFormButtonMultiStepAmount.vue
+++ b/src/components/DonationForm/Forms/MainDonationFormButtonMultiStepAmount.vue
@@ -6,10 +6,10 @@
 
 <script setup lang="ts">
 import { computed, inject } from 'vue';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { useFormModel } from '@src/components/composables/useFormModel';
 import { Translator } from '@src/Translator';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 const formModel = useFormModel();
 const translator = inject<Translator>( 'translator' );
diff --git a/src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue b/src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue
index 2ceef237a..377c79210 100644
--- a/src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue
+++ b/src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue
@@ -6,10 +6,10 @@
 
 <script setup lang="ts">
 import { computed, inject } from 'vue';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { useFormModel } from '@src/components/composables/useFormModel';
 import { Translator } from '@src/Translator';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 const formModel = useFormModel();
 const translator = inject<Translator>( 'translator' );
diff --git a/src/components/DonationForm/Forms/MainDonationFormTransactionFees.vue b/src/components/DonationForm/Forms/MainDonationFormTransactionFees.vue
index 43776bf31..22efb4250 100644
--- a/src/components/DonationForm/Forms/MainDonationFormTransactionFees.vue
+++ b/src/components/DonationForm/Forms/MainDonationFormTransactionFees.vue
@@ -90,16 +90,16 @@ export default {
 <script setup lang="ts">
 
 import { inject, ref } from 'vue';
-import SelectGroup from '@src/components/DonationForm/SubComponents/SelectGroup.vue';
-import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { isValidOrUnset } from '@src/components/DonationForm/Forms/isValidOrUnset';
+import MainDonationFormButtonMultiStep from '@src/components/DonationForm/Forms/MainDonationFormButtonMultiStep.vue';
 import SelectCustomAmount from '@src/components/DonationForm/SubComponents/SelectCustomAmount.vue';
+import SelectGroup from '@src/components/DonationForm/SubComponents/SelectGroup.vue';
 import SmsBox from '@src/components/DonationForm/SubComponents/SmsBox.vue';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { newDonationFormValidator } from '@src/validation/DonationFormValidator';
 import { amountValidityMessageKey } from '@src/utils/amountValidityMessageKey';
-import { isValidOrUnset } from '@src/components/DonationForm/Forms/isValidOrUnset';
 import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
-import MainDonationFormButtonMultiStep from '@src/components/DonationForm/Forms/MainDonationFormButtonMultiStep.vue';
+import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
+import { newDonationFormValidator } from '@src/validation/DonationFormValidator';
 
 interface Props {
 	showErrorScrollLink?: boolean;
diff --git a/src/components/DonationForm/Forms/UpgradeToMonthlyForm.vue b/src/components/DonationForm/Forms/UpgradeToMonthlyForm.vue
index 62dad4128..8c4c54a54 100644
--- a/src/components/DonationForm/Forms/UpgradeToMonthlyForm.vue
+++ b/src/components/DonationForm/Forms/UpgradeToMonthlyForm.vue
@@ -91,13 +91,13 @@ export default {
 
 import { inject, ref, watch } from 'vue';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { Validity } from '@src/utils/FormModel/Validity';
+import { useFormStepShownEvent } from '@src/components/DonationForm/Forms/useFormStepShownEvent';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
-import { Tracker } from '@src/tracking/Tracker';
 import { UpgradeToMonthlyEvent } from '@src/tracking/events/UpgradeToMonthlyEvent';
-import { useFormStepShownEvent } from '@src/components/DonationForm/Forms/useFormStepShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { Validity } from '@src/utils/FormModel/Validity';
 
 interface AmountSuggestion {
 	lowerRangeLimit: number,
diff --git a/src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue b/src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue
index 0825dace0..034b0413e 100644
--- a/src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue
+++ b/src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue
@@ -45,12 +45,12 @@
 <script setup lang="ts">
 import { computed, inject, ref } from 'vue';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import { useFormStepShownEvent } from '@src/components/DonationForm/Forms/useFormStepShownEvent';
-import { Tracker } from '@src/tracking/Tracker';
-import { UpgradeToYearlyEvent } from '@src/tracking/events/UpgradeToYearlyEvent';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
+import { UpgradeToYearlyEvent } from '@src/tracking/events/UpgradeToYearlyEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 
 interface Props {
 	isCurrent: boolean;
diff --git a/src/components/DonationForm/Forms/UpgradeToYearlyForm.vue b/src/components/DonationForm/Forms/UpgradeToYearlyForm.vue
index c7c02c6d9..a3877bd01 100644
--- a/src/components/DonationForm/Forms/UpgradeToYearlyForm.vue
+++ b/src/components/DonationForm/Forms/UpgradeToYearlyForm.vue
@@ -91,13 +91,13 @@ export default {
 
 import { computed, inject, ref } from 'vue';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { Validity } from '@src/utils/FormModel/Validity';
+import { useFormStepShownEvent } from '@src/components/DonationForm/Forms/useFormStepShownEvent';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
-import { Tracker } from '@src/tracking/Tracker';
 import { UpgradeToYearlyEvent } from '@src/tracking/events/UpgradeToYearlyEvent';
-import { useFormStepShownEvent } from '@src/components/DonationForm/Forms/useFormStepShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { Validity } from '@src/utils/FormModel/Validity';
 
 interface Props {
 	isCurrent: boolean
diff --git a/src/components/DonationForm/Forms/isValidOrUnset.ts b/src/components/DonationForm/Forms/isValidOrUnset.ts
index e68c48627..70e5bbe51 100644
--- a/src/components/DonationForm/Forms/isValidOrUnset.ts
+++ b/src/components/DonationForm/Forms/isValidOrUnset.ts
@@ -1,5 +1,5 @@
-import { Validity } from '@src/utils/FormModel/Validity';
 import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
+import { Validity } from '@src/utils/FormModel/Validity';
 
 export function isValidOrUnset( validity: Validity|AmountValidity ): boolean {
 	return validity === Validity.Valid ||
diff --git a/src/components/DonationForm/MultiStepDonation.vue b/src/components/DonationForm/MultiStepDonation.vue
index 8aad4f0ad..afec0a2d8 100644
--- a/src/components/DonationForm/MultiStepDonation.vue
+++ b/src/components/DonationForm/MultiStepDonation.vue
@@ -18,15 +18,15 @@
 
 <script setup lang="ts">
 
-import { computed, inject, nextTick, onMounted, ref, useSlots } from 'vue';
 import { useKeenSlider } from 'keen-slider/vue';
-import SubmitValues from '@src/components/DonationForm/SubComponents/SubmitValues.vue';
+import { computed, inject, nextTick, onMounted, ref, useSlots } from 'vue';
+import { useFormAction } from '@src/components/composables/useFormAction';
 import { StepController } from '@src/components/DonationForm/StepController';
-import { PageScroller } from '@src/utils/PageScroller/PageScroller';
+import SubmitValues from '@src/components/DonationForm/SubComponents/SubmitValues.vue';
+import { FormActions } from '@src/domain/FormActions';
 import { Tracker } from '@src/tracking/Tracker';
 import { TrackingEvent } from '@src/tracking/TrackingEvent';
-import { useFormAction } from '@src/components/composables/useFormAction';
-import { FormActions } from '@src/domain/FormActions';
+import { PageScroller } from '@src/utils/PageScroller/PageScroller';
 import { Timer } from '@src/utils/Timer';
 
 interface Props {
diff --git a/src/components/DonationForm/StepControllers/IntermediateCustomAmount.ts b/src/components/DonationForm/StepControllers/IntermediateCustomAmount.ts
index 505f0454e..e0ecc28da 100644
--- a/src/components/DonationForm/StepControllers/IntermediateCustomAmount.ts
+++ b/src/components/DonationForm/StepControllers/IntermediateCustomAmount.ts
@@ -1,7 +1,7 @@
-import { FormModel } from '@src/utils/FormModel/FormModel';
 import { StepController } from '@src/components/DonationForm/StepController';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { FormModel } from '@src/utils/FormModel/FormModel';
 
 export function createIntermediateCustomAmount( formModel: FormModel, stepNameOfNext: string, stepNameOfPreviousPage: string ): StepController {
 	return {
diff --git a/src/components/DonationForm/StepControllers/IntermediateMainDonationForm.ts b/src/components/DonationForm/StepControllers/IntermediateMainDonationForm.ts
index c6f548b06..afd9a43b8 100644
--- a/src/components/DonationForm/StepControllers/IntermediateMainDonationForm.ts
+++ b/src/components/DonationForm/StepControllers/IntermediateMainDonationForm.ts
@@ -1,8 +1,8 @@
-import { FormModel } from '@src/utils/FormModel/FormModel';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { StepController } from '@src/components/DonationForm/StepController';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { FormModel } from '@src/utils/FormModel/FormModel';
 
 export function createIntermediateMainDonationForm( formModel: FormModel, stepNameOfUpgradeToYearly: string, stepNameOfAddress: string ): StepController {
 	return {
diff --git a/src/components/DonationForm/StepControllers/IntermediateUpgradeToYearly.ts b/src/components/DonationForm/StepControllers/IntermediateUpgradeToYearly.ts
index 0f1afab8d..6ec82a52b 100644
--- a/src/components/DonationForm/StepControllers/IntermediateUpgradeToYearly.ts
+++ b/src/components/DonationForm/StepControllers/IntermediateUpgradeToYearly.ts
@@ -1,7 +1,7 @@
 import { StepController } from '@src/components/DonationForm/StepController';
+import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { FormModel } from '@src/utils/FormModel/FormModel';
-import { StepAction } from '@src/components/DonationForm/StepNavigation';
 
 export function createIntermediateUpgradeToYearly(
 	formModel: FormModel,
diff --git a/src/components/DonationForm/StepControllers/SubmittableAddressType.ts b/src/components/DonationForm/StepControllers/SubmittableAddressType.ts
index 319571f6b..c2c68d267 100644
--- a/src/components/DonationForm/StepControllers/SubmittableAddressType.ts
+++ b/src/components/DonationForm/StepControllers/SubmittableAddressType.ts
@@ -1,8 +1,8 @@
-import { FormModel } from '@src/utils/FormModel/FormModel';
 import { StepController } from '@src/components/DonationForm/StepController';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { Validity } from '@src/utils/FormModel/Validity';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { FormModel } from '@src/utils/FormModel/FormModel';
+import { Validity } from '@src/utils/FormModel/Validity';
 
 export function createSubmittableAddressType( formModel: FormModel, pageIndexForPrevious: string ): StepController {
 	return {
diff --git a/src/components/DonationForm/StepControllers/SubmittableCustomAmount.ts b/src/components/DonationForm/StepControllers/SubmittableCustomAmount.ts
index 73096ba36..ea34d1644 100644
--- a/src/components/DonationForm/StepControllers/SubmittableCustomAmount.ts
+++ b/src/components/DonationForm/StepControllers/SubmittableCustomAmount.ts
@@ -1,8 +1,8 @@
-import { FormModel } from '@src/utils/FormModel/FormModel';
 import { StepController } from '@src/components/DonationForm/StepController';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { FormModel } from '@src/utils/FormModel/FormModel';
 
 export function createSubmittableCustomAmount( formModel: FormModel, stepNamePrevious: string ): StepController {
 	return {
diff --git a/src/components/DonationForm/StepControllers/SubmittableMainDonationForm.ts b/src/components/DonationForm/StepControllers/SubmittableMainDonationForm.ts
index 0d7aa9bed..6ee713017 100644
--- a/src/components/DonationForm/StepControllers/SubmittableMainDonationForm.ts
+++ b/src/components/DonationForm/StepControllers/SubmittableMainDonationForm.ts
@@ -1,9 +1,9 @@
-import { FormModel } from '@src/utils/FormModel/FormModel';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { StepController } from '@src/components/DonationForm/StepController';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { FormModel } from '@src/utils/FormModel/FormModel';
 
 export function createSubmittableMainDonationForm( formModel: FormModel, stepNameOfUpgradeToYearly: string ): StepController {
 	return {
diff --git a/src/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous.ts b/src/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous.ts
index 093fc4ee4..ce8aa154a 100644
--- a/src/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous.ts
+++ b/src/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous.ts
@@ -2,8 +2,8 @@ import { StepController } from '@src/components/DonationForm/StepController';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
-import { FormModel } from '@src/utils/FormModel/FormModel';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { FormModel } from '@src/utils/FormModel/FormModel';
 
 export function createSubmittableMainDonationFormSinglePageAnonymous( formModel: FormModel ): StepController {
 	return {
diff --git a/src/components/DonationForm/StepControllers/SubmittableMainDonationFormUpgradeOptions.ts b/src/components/DonationForm/StepControllers/SubmittableMainDonationFormUpgradeOptions.ts
index e5492bf49..dc24cd05d 100644
--- a/src/components/DonationForm/StepControllers/SubmittableMainDonationFormUpgradeOptions.ts
+++ b/src/components/DonationForm/StepControllers/SubmittableMainDonationFormUpgradeOptions.ts
@@ -1,9 +1,9 @@
-import { FormModel } from '@src/utils/FormModel/FormModel';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { StepController } from '@src/components/DonationForm/StepController';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { FormModel } from '@src/utils/FormModel/FormModel';
 
 const shouldLeadToMonthlyUpgradePage = ( formModel: FormModel, lowerAmountLimit: number, upperAmountLimit: number ): boolean => {
 	if ( formModel.interval.value !== Intervals.ONCE.value ) {
diff --git a/src/components/DonationForm/StepControllers/SubmittableMainDonationFormWhenOverAmount.ts b/src/components/DonationForm/StepControllers/SubmittableMainDonationFormWhenOverAmount.ts
index 1127d8632..5aef00968 100644
--- a/src/components/DonationForm/StepControllers/SubmittableMainDonationFormWhenOverAmount.ts
+++ b/src/components/DonationForm/StepControllers/SubmittableMainDonationFormWhenOverAmount.ts
@@ -1,9 +1,9 @@
-import { FormModel } from '@src/utils/FormModel/FormModel';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { StepController } from '@src/components/DonationForm/StepController';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { FormModel } from '@src/utils/FormModel/FormModel';
 
 const shouldSubmit = ( formModel: FormModel, submitWhenOverAmount: number ): boolean => {
 	if ( formModel.interval.value !== Intervals.ONCE.value ) {
diff --git a/src/components/DonationForm/StepControllers/SubmittableUpgradeToMonthly.ts b/src/components/DonationForm/StepControllers/SubmittableUpgradeToMonthly.ts
index fe49660d7..73d698ef1 100644
--- a/src/components/DonationForm/StepControllers/SubmittableUpgradeToMonthly.ts
+++ b/src/components/DonationForm/StepControllers/SubmittableUpgradeToMonthly.ts
@@ -1,8 +1,8 @@
 import { StepController } from '@src/components/DonationForm/StepController';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { FormModel } from '@src/utils/FormModel/FormModel';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { FormModel } from '@src/utils/FormModel/FormModel';
 
 export function createSubmittableUpgradeToMonthly( formModel: FormModel, stepNameOfLinkClick: string, stepNameOfPreviousPage: string ): StepController {
 	return {
diff --git a/src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly.ts b/src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly.ts
index 9d6d0622b..326a4fdb5 100644
--- a/src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly.ts
+++ b/src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly.ts
@@ -1,8 +1,8 @@
 import { StepController } from '@src/components/DonationForm/StepController';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { FormModel } from '@src/utils/FormModel/FormModel';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { FormModel } from '@src/utils/FormModel/FormModel';
 
 export function createSubmittableUpgradeToYearly( formModel: FormModel, stepNameOfLinkClick: string, stepNameOfPreviousPage: string ): StepController {
 	return {
diff --git a/src/components/DonationForm/SubComponents/SubmitValues.vue b/src/components/DonationForm/SubComponents/SubmitValues.vue
index 6de3e2c71..5b86200c6 100644
--- a/src/components/DonationForm/SubComponents/SubmitValues.vue
+++ b/src/components/DonationForm/SubComponents/SubmitValues.vue
@@ -9,8 +9,8 @@
 
 <script setup lang="ts">
 
-import { useFormModel } from '@src/components/composables/useFormModel';
 import { computed } from 'vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 
 const { addressType, totalNumericAmount, interval, paymentMethod } = useFormModel();
 
diff --git a/src/components/FallbackBanner/LargeFooter.vue b/src/components/FallbackBanner/LargeFooter.vue
index 6243d0a60..62de62d82 100644
--- a/src/components/FallbackBanner/LargeFooter.vue
+++ b/src/components/FallbackBanner/LargeFooter.vue
@@ -12,9 +12,9 @@
 
 <script setup lang="ts">
 
-import UseOfFundsLink from '@src/components/FallbackBanner/UseOfFundsLink.vue';
 import FallbackBank from '@src/components/FallbackBanner/FallbackBank.vue';
 import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
+import UseOfFundsLink from '@src/components/FallbackBanner/UseOfFundsLink.vue';
 
 defineEmits( [ 'use-of-funds-button-clicked', 'submit-button-clicked' ] );
 
diff --git a/src/components/Footer/FooterAlreadyDonated.vue b/src/components/Footer/FooterAlreadyDonated.vue
index 401d3d7ad..78b751c89 100644
--- a/src/components/Footer/FooterAlreadyDonated.vue
+++ b/src/components/Footer/FooterAlreadyDonated.vue
@@ -30,11 +30,11 @@
 </template>
 
 <script setup lang="ts">
+import { inject } from 'vue';
 import SelectionInput from '@src/components/Footer/SelectionInput.vue';
 import TickIcon from '@src/components/Icons/TickIcon.vue';
-import { inject } from 'vue';
-import { Tracker } from '@src/tracking/Tracker';
 import { ClickAlreadyDonatedEvent } from '@src/tracking/events/ClickAlreadyDonatedEvent';
+import { Tracker } from '@src/tracking/Tracker';
 
 const tracker = inject<Tracker>( 'tracker' );
 
diff --git a/src/components/ProgressBar/ProgressBar.vue b/src/components/ProgressBar/ProgressBar.vue
index d5e59ac61..c7e848f08 100644
--- a/src/components/ProgressBar/ProgressBar.vue
+++ b/src/components/ProgressBar/ProgressBar.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject } from 'vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	amountToShowOnRight: 'TARGET'|'MISSING'
diff --git a/src/components/ProgressBar/ProgressBarAlternative.vue b/src/components/ProgressBar/ProgressBarAlternative.vue
index 305a956d4..921cc189c 100644
--- a/src/components/ProgressBar/ProgressBarAlternative.vue
+++ b/src/components/ProgressBar/ProgressBarAlternative.vue
@@ -26,8 +26,8 @@
 </template>
 
 <script setup lang="ts">
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { inject } from 'vue';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 interface Props {
 	amountToShowOnRight: 'TARGET'|'MISSING'
diff --git a/src/components/Slider/KeenSlider.vue b/src/components/Slider/KeenSlider.vue
index bd0bb5288..367d87768 100644
--- a/src/components/Slider/KeenSlider.vue
+++ b/src/components/Slider/KeenSlider.vue
@@ -34,8 +34,8 @@
 </template>
 
 <script setup lang="ts">
-import { inject, onMounted, ref, watch } from 'vue';
 import { KeenSliderOptions, useKeenSlider } from 'keen-slider/vue';
+import { inject, onMounted, ref, watch } from 'vue';
 import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
 import ChevronRightIcon from '@src/components/Icons/ChevronRightIcon.vue';
 import KeenSliderNavigation from '@src/components/Slider/KeenSliderNavigation.vue';
diff --git a/src/components/UseOfFunds/CompanyBudgets.vue b/src/components/UseOfFunds/CompanyBudgets.vue
index 8c435fdb7..b4df9e521 100644
--- a/src/components/UseOfFunds/CompanyBudgets.vue
+++ b/src/components/UseOfFunds/CompanyBudgets.vue
@@ -22,9 +22,9 @@
 
 <script setup lang="ts">
 
-import { Company } from '@src/domain/UseOfFunds/Company';
 import { computed } from 'vue';
 import CompanyCitation from '@src/components/UseOfFunds/CompanyCitation.vue';
+import { Company } from '@src/domain/UseOfFunds/Company';
 
 interface Props {
 	companies: Company[];
diff --git a/src/components/UseOfFunds/FundsContent.vue b/src/components/UseOfFunds/FundsContent.vue
index 8ef54e223..72d15614e 100644
--- a/src/components/UseOfFunds/FundsContent.vue
+++ b/src/components/UseOfFunds/FundsContent.vue
@@ -62,10 +62,10 @@
 
 <script setup lang="ts">
 
-import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import FundsDistributionAccordion from '@src/components/UseOfFunds/FundsDistributionAccordion.vue';
-import CompanyBudgets from '@src/components/UseOfFunds/CompanyBudgets.vue';
 import BenefitsIcon from '@src/components/UseOfFunds/BenefitsIcon.vue';
+import CompanyBudgets from '@src/components/UseOfFunds/CompanyBudgets.vue';
+import FundsDistributionAccordion from '@src/components/UseOfFunds/FundsDistributionAccordion.vue';
+import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
 
 interface Props {
 	content: UseOfFundsContent;
diff --git a/src/components/UseOfFunds/FundsDistributionAccordion.vue b/src/components/UseOfFunds/FundsDistributionAccordion.vue
index fe4484cde..83e6409a8 100644
--- a/src/components/UseOfFunds/FundsDistributionAccordion.vue
+++ b/src/components/UseOfFunds/FundsDistributionAccordion.vue
@@ -20,9 +20,9 @@
 
 <script setup lang="ts">
 
-import { ApplicationOfFundsItem } from '@src/domain/UseOfFunds/ApplicationOfFundsItem';
 import { ref } from 'vue';
 import ChevronDownIcon from '@src/components/Icons/ChevronDownIcon.vue';
+import { ApplicationOfFundsItem } from '@src/domain/UseOfFunds/ApplicationOfFundsItem';
 
 interface Props {
 	applicationOfFundsData: ApplicationOfFundsItem[]
diff --git a/src/components/UseOfFunds/FundsModal.vue b/src/components/UseOfFunds/FundsModal.vue
index e4b8be35b..a6ba436f1 100644
--- a/src/components/UseOfFunds/FundsModal.vue
+++ b/src/components/UseOfFunds/FundsModal.vue
@@ -21,9 +21,9 @@
 <script setup lang="ts">
 
 import FundsContent from '@src/components/UseOfFunds/FundsContent.vue';
-import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
-import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
 import IconClose from '@src/components/UseOfFunds/Icons/IconClose.vue';
+import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
+import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
 
 interface Props {
 	isFundsModalVisible: boolean,
diff --git a/src/components/composables/useAmountBasedFormAction.ts b/src/components/composables/useAmountBasedFormAction.ts
index f9723d9f3..0afeed414 100644
--- a/src/components/composables/useAmountBasedFormAction.ts
+++ b/src/components/composables/useAmountBasedFormAction.ts
@@ -1,7 +1,7 @@
-import { FormActions } from '@src/domain/FormActions';
 import { computed, Ref } from 'vue';
-import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import { FormActions } from '@src/domain/FormActions';
+import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 export function useFormAction( formActions: FormActions, minimumAmount: number, extraURLParameters: { smallAmount: string, largeAmount: string } ): { formAction: Ref<string> } {
diff --git a/src/components/composables/useAnonymousAddressTypeSetter.ts b/src/components/composables/useAnonymousAddressTypeSetter.ts
index a8f1cae18..a20e487b6 100644
--- a/src/components/composables/useAnonymousAddressTypeSetter.ts
+++ b/src/components/composables/useAnonymousAddressTypeSetter.ts
@@ -1,7 +1,7 @@
 import { watch } from 'vue';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 export function useAnonymousAddressTypeSetter(): void {
 	const formModel = useFormModel();
diff --git a/src/components/composables/useDisplaySwitch.ts b/src/components/composables/useDisplaySwitch.ts
index 073e99356..bf388aaed 100644
--- a/src/components/composables/useDisplaySwitch.ts
+++ b/src/components/composables/useDisplaySwitch.ts
@@ -1,4 +1,4 @@
-import { onMounted, onUnmounted, Ref, ref } from 'vue';
+import { onMounted, onUnmounted, ref, Ref } from 'vue';
 
 export function useDisplaySwitch( minWidthForLargeScreen: number ): Ref<boolean> {
 
diff --git a/src/components/composables/useFormAction.ts b/src/components/composables/useFormAction.ts
index f606301a4..7503d2ab1 100644
--- a/src/components/composables/useFormAction.ts
+++ b/src/components/composables/useFormAction.ts
@@ -1,7 +1,7 @@
-import { FormActions } from '@src/domain/FormActions';
 import { computed, Ref } from 'vue';
-import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import { FormActions } from '@src/domain/FormActions';
+import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 export function useFormAction( formActions: FormActions ): { formAction: Ref<string> } {
diff --git a/src/components/composables/useFormModel.ts b/src/components/composables/useFormModel.ts
index ed6719070..f265f8b2c 100644
--- a/src/components/composables/useFormModel.ts
+++ b/src/components/composables/useFormModel.ts
@@ -1,11 +1,11 @@
 import { computed, ref, watch } from 'vue';
+import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
+import { Intervals, RecurringIntervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
 import { FormModel } from '@src/utils/FormModel/FormModel';
 import { Validity } from '@src/utils/FormModel/Validity';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { Intervals, RecurringIntervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { parseFloatFromFormattedString } from '@src/utils/parseFloatFromFormattedString';
-import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
 
 export type TransactionFee = {
 	fixedFee: number;
diff --git a/src/createFallbackDonationURL.ts b/src/createFallbackDonationURL.ts
index 348583ac3..1b2f3efcc 100644
--- a/src/createFallbackDonationURL.ts
+++ b/src/createFallbackDonationURL.ts
@@ -1,6 +1,6 @@
+import { createDonationURL } from '@src/createDonationURL';
 import { TrackingParameters } from '@src/domain/TrackingParameters';
 import { ImpressionCount } from '@src/utils/ImpressionCount';
-import { createDonationURL } from '@src/createDonationURL';
 
 /**
  * This function is used for the fallback banner, as it replaces the usual tracking parameters with mini
diff --git a/src/createVueApp.ts b/src/createVueApp.ts
index 1434280ca..22a947833 100644
--- a/src/createVueApp.ts
+++ b/src/createVueApp.ts
@@ -1,6 +1,6 @@
 import { createApp } from 'vue';
+import type { App, Component } from 'vue';
 import config from '@environment/config';
-import type { Component, App } from 'vue';
 
 // Declare external "Vue" object, which might or might not exist
 // In Production it's a global variable, in the dev environment it's undefined
diff --git a/src/page/MediaWiki/MediaWiki.ts b/src/page/MediaWiki/MediaWiki.ts
index 2eaa07351..53794fa75 100644
--- a/src/page/MediaWiki/MediaWiki.ts
+++ b/src/page/MediaWiki/MediaWiki.ts
@@ -1,6 +1,6 @@
+import { BannerEvent } from '@src/page/MediaWiki/BannerEvent';
 import { LegacyBannerEvent } from '@src/page/MediaWiki/LegacyBannerEvent';
 import { SizeIssue } from '@src/page/MediaWiki/SizeIssue';
-import { BannerEvent } from '@src/page/MediaWiki/BannerEvent';
 
 export interface MediaWiki {
 	getConfigItem( name: string ): any;
diff --git a/src/page/MediaWiki/WindowMediaWiki.ts b/src/page/MediaWiki/WindowMediaWiki.ts
index 30b0caee7..dbd7cd110 100644
--- a/src/page/MediaWiki/WindowMediaWiki.ts
+++ b/src/page/MediaWiki/WindowMediaWiki.ts
@@ -1,9 +1,9 @@
-import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
-import { LegacyBannerEvent } from '@src/page/MediaWiki/LegacyBannerEvent';
-import { SizeIssue } from '@src/page/MediaWiki/SizeIssue';
 import { BannerEvent } from '@src/page/MediaWiki/BannerEvent';
-import { setCookie } from '@src/page/MediaWiki/setCookie';
 import { createImageCookieSetter } from '@src/page/MediaWiki/createImageCookieSetter';
+import { LegacyBannerEvent } from '@src/page/MediaWiki/LegacyBannerEvent';
+import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
+import { setCookie } from '@src/page/MediaWiki/setCookie';
+import { SizeIssue } from '@src/page/MediaWiki/SizeIssue';
 
 interface MediaWikiTools {
 	config: { get: ( item: string ) => any };
diff --git a/src/page/Page.ts b/src/page/Page.ts
index 7c99a3a2b..dda7d9fb7 100644
--- a/src/page/Page.ts
+++ b/src/page/Page.ts
@@ -1,8 +1,8 @@
 import { CampaignParameters } from '@src/domain/CampaignParameters';
-import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
-import { Vector2 } from '@src/utils/Vector2';
 import { TrackingParameters } from '@src/domain/TrackingParameters';
+import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
 import { TrackingEvent } from '@src/tracking/TrackingEvent';
+import { Vector2 } from '@src/utils/Vector2';
 
 export interface Page {
 	getReasonToNotShowBanner: ( bannerDimensions: Vector2 ) => BannerNotShownReasons|null;
diff --git a/src/page/PageWPDE.ts b/src/page/PageWPDE.ts
index 4755606b6..cefce0bd0 100644
--- a/src/page/PageWPDE.ts
+++ b/src/page/PageWPDE.ts
@@ -1,8 +1,8 @@
-import { Page } from '@src/page/Page';
-import { BannerNotShownReasons } from './BannerNotShownReasons';
+import { getCampaignParameterOverride } from '@environment/CampaignParameterOverride';
 import { CampaignParameters } from '@src/domain/CampaignParameters';
 import { TrackingParameters } from '@src/domain/TrackingParameters';
-import { getCampaignParameterOverride } from '@environment/CampaignParameterOverride';
+import { Page } from '@src/page/Page';
+import { BannerNotShownReasons } from './BannerNotShownReasons';
 
 export const bannerHeightCssVariable = '--wmde-banner-height';
 export const showBannerClass = 'wmde-show-banner';
diff --git a/src/page/PageWPORG.ts b/src/page/PageWPORG.ts
index 3f4f5425f..5da0f3772 100644
--- a/src/page/PageWPORG.ts
+++ b/src/page/PageWPORG.ts
@@ -1,15 +1,15 @@
+import { getCampaignParameterOverride } from '@environment/CampaignParameterOverride';
+import { CampaignParameters } from '@src/domain/CampaignParameters';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { TrackingParameters } from '@src/domain/TrackingParameters';
+import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { ChannelNameWPORG } from '@src/page/ChannelNameWPORG';
+import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
 import { Page } from '@src/page/Page';
 import { Skin } from '@src/page/skin/Skin';
-import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
-import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { TrackingEvent } from '@src/tracking/TrackingEvent';
 import { SizeIssueChecker } from '@src/utils/SizeIssueChecker/SizeIssueChecker';
 import { Vector2 } from '@src/utils/Vector2';
-import { CampaignParameters } from '@src/domain/CampaignParameters';
-import { getCampaignParameterOverride } from '@environment/CampaignParameterOverride';
-import { TrackingParameters } from '@src/domain/TrackingParameters';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { TrackingEvent } from '@src/tracking/TrackingEvent';
-import { ChannelNameWPORG } from '@src/page/ChannelNameWPORG';
 
 export const bannerAppId = 'wmde-banner-app';
 export const bannerAnimatedClass = 'wmde-animate-banner';
diff --git a/src/page/skin/SkinFactory.ts b/src/page/skin/SkinFactory.ts
index 11a384076..dbcb8929d 100644
--- a/src/page/skin/SkinFactory.ts
+++ b/src/page/skin/SkinFactory.ts
@@ -1,8 +1,8 @@
+import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
 import Minerva from '@src/page/skin/Minerva';
-import Vector2022 from '@src/page/skin/Vector2022';
-import Vector from '@src/page/skin/Vector';
 import { Skin } from '@src/page/skin/Skin';
-import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
+import Vector from '@src/page/skin/Vector';
+import Vector2022 from '@src/page/skin/Vector2022';
 
 export class SkinFactory {
 	private _mediaWiki: MediaWiki;
diff --git a/src/tracking/LegacyEventTracking/mapNotShownEvent.ts b/src/tracking/LegacyEventTracking/mapNotShownEvent.ts
index d85fbd4ac..63388194f 100644
--- a/src/tracking/LegacyEventTracking/mapNotShownEvent.ts
+++ b/src/tracking/LegacyEventTracking/mapNotShownEvent.ts
@@ -1,7 +1,7 @@
 import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
 import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 
 /**
  * @deprecated Will be removed when the new tracking schema is implemented
diff --git a/src/tracking/LegacyEventTracking/mapShownEvent.ts b/src/tracking/LegacyEventTracking/mapShownEvent.ts
index 811a5acb9..2f2a505b3 100644
--- a/src/tracking/LegacyEventTracking/mapShownEvent.ts
+++ b/src/tracking/LegacyEventTracking/mapShownEvent.ts
@@ -1,7 +1,7 @@
-import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
-import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
 import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo';
+import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
+import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
 export function mapShownEvent( shownEvent: ShownEvent ): WMDESizeIssueEvent|WMDELegacyBannerEvent {
 	if ( shownEvent.feature === 'FallbackBanner' ) {
diff --git a/src/tracking/LegacyTrackerWPORG.ts b/src/tracking/LegacyTrackerWPORG.ts
index cdef7edb4..17e6689dd 100644
--- a/src/tracking/LegacyTrackerWPORG.ts
+++ b/src/tracking/LegacyTrackerWPORG.ts
@@ -1,6 +1,6 @@
+import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
 import { Tracker } from '@src/tracking/Tracker';
 import { TrackingEvent } from '@src/tracking/TrackingEvent';
-import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
 import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 import { RuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
diff --git a/src/tracking/TrackerWPDE.ts b/src/tracking/TrackerWPDE.ts
index bb8016d26..70fc7014e 100644
--- a/src/tracking/TrackerWPDE.ts
+++ b/src/tracking/TrackerWPDE.ts
@@ -1,10 +1,10 @@
-import { Tracker } from '@src/tracking/Tracker';
-import { TrackingEvent } from '@src/tracking/TrackingEvent';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { RuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { TrackingEvent } from '@src/tracking/TrackingEvent';
+import { RuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
 
 type TrackingRatesForEvents = Map<string, number>;
 
diff --git a/src/tracking/events/NotShownEvent.ts b/src/tracking/events/NotShownEvent.ts
index 0490d25fb..db78f4e71 100644
--- a/src/tracking/events/NotShownEvent.ts
+++ b/src/tracking/events/NotShownEvent.ts
@@ -1,5 +1,5 @@
-import { TrackingEvent, TrackingFeatureName } from '@src/tracking/TrackingEvent';
 import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { TrackingEvent, TrackingFeatureName } from '@src/tracking/TrackingEvent';
 
 export interface NotShownCustomData {
 	reason: BannerNotShownReasons;
diff --git a/src/utils/DynamicContent/DynamicCampaignText.ts b/src/utils/DynamicContent/DynamicCampaignText.ts
index 9b4b6d887..43942781f 100644
--- a/src/utils/DynamicContent/DynamicCampaignText.ts
+++ b/src/utils/DynamicContent/DynamicCampaignText.ts
@@ -1,20 +1,20 @@
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { DayName } from '@src/utils/DynamicContent/generators/DayName';
+import { CampaignParameters } from '@src/domain/CampaignParameters';
 import { Translator } from '@src/Translator';
-import { CurrentDate } from '@src/utils/DynamicContent/generators/CurrentDate';
+import { CampaignProjection } from '@src/utils/DynamicContent/CampaignProjection';
+import { DateAndTime } from '@src/utils/DynamicContent/DateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { DynamicProgressBarContent } from '@src/utils/DynamicContent/DynamicProgressBarContent';
 import { Formatters } from '@src/utils/DynamicContent/Formatters';
-import { CampaignParameters } from '@src/domain/CampaignParameters';
-import TimeRange from '@src/utils/TimeRange';
-import { DaysLeftSentence } from '@src/utils/DynamicContent/generators/DaysLeftSentence';
 import { CampaignDaySentence } from '@src/utils/DynamicContent/generators/CampaignDaySentence';
-import { VisitorsVsDonorsSentence } from '@src/utils/DynamicContent/generators/VisitorsVsDonorsSentence';
+import { CurrentDate } from '@src/utils/DynamicContent/generators/CurrentDate';
+import { CurrentTime } from '@src/utils/DynamicContent/generators/CurrentTime';
+import { DayName } from '@src/utils/DynamicContent/generators/DayName';
+import { DaysLeftSentence } from '@src/utils/DynamicContent/generators/DaysLeftSentence';
 import { DonorsNeededSentence } from '@src/utils/DynamicContent/generators/DonorsNeededSentence';
-import { CampaignProjection } from '@src/utils/DynamicContent/CampaignProjection';
-import { ImpressionCount } from '@src/utils/ImpressionCount';
 import { ProgressBarContent } from '@src/utils/DynamicContent/generators/ProgressBarContent';
-import { DynamicProgressBarContent } from '@src/utils/DynamicContent/DynamicProgressBarContent';
-import { CurrentTime } from '@src/utils/DynamicContent/generators/CurrentTime';
-import { DateAndTime } from '@src/utils/DynamicContent/DateAndTime';
+import { VisitorsVsDonorsSentence } from '@src/utils/DynamicContent/generators/VisitorsVsDonorsSentence';
+import { ImpressionCount } from '@src/utils/ImpressionCount';
+import TimeRange from '@src/utils/TimeRange';
 
 export default class DynamicCampaignText implements DynamicContent {
 	private readonly _date: Date;
diff --git a/src/utils/DynamicContent/DynamicContent.ts b/src/utils/DynamicContent/DynamicContent.ts
index 74b42a335..c2b57772c 100644
--- a/src/utils/DynamicContent/DynamicContent.ts
+++ b/src/utils/DynamicContent/DynamicContent.ts
@@ -1,5 +1,5 @@
-import { DynamicProgressBarContent } from '@src/utils/DynamicContent/DynamicProgressBarContent';
 import { DateAndTime } from '@src/utils/DynamicContent/DateAndTime';
+import { DynamicProgressBarContent } from '@src/utils/DynamicContent/DynamicProgressBarContent';
 
 /**
  * Properties in this interface are for items that are generated once and are then static after
diff --git a/src/utils/DynamicContent/Formatters.ts b/src/utils/DynamicContent/Formatters.ts
index 38b800e4d..d32603abf 100644
--- a/src/utils/DynamicContent/Formatters.ts
+++ b/src/utils/DynamicContent/Formatters.ts
@@ -1,6 +1,6 @@
-import { Ordinal } from '@src/utils/DynamicContent/formatters/Ordinal';
 import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import { Integer } from '@src/utils/DynamicContent/formatters/Integer';
+import { Ordinal } from '@src/utils/DynamicContent/formatters/Ordinal';
 import { Time } from '@src/utils/DynamicContent/formatters/Time';
 
 export interface Formatters {
diff --git a/src/utils/DynamicContent/formatters/CurrencyDe.ts b/src/utils/DynamicContent/formatters/CurrencyDe.ts
index cc8240874..fa076b85f 100644
--- a/src/utils/DynamicContent/formatters/CurrencyDe.ts
+++ b/src/utils/DynamicContent/formatters/CurrencyDe.ts
@@ -1,5 +1,5 @@
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import formatter from 'format-number';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 
 export class CurrencyDe implements Currency {
diff --git a/src/utils/DynamicContent/formatters/CurrencyEn.ts b/src/utils/DynamicContent/formatters/CurrencyEn.ts
index a513d60f5..f0f1a8d61 100644
--- a/src/utils/DynamicContent/formatters/CurrencyEn.ts
+++ b/src/utils/DynamicContent/formatters/CurrencyEn.ts
@@ -1,5 +1,5 @@
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import formatter from 'format-number';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
 
 export class CurrencyEn implements Currency {
diff --git a/src/utils/DynamicContent/formatters/IntegerDe.ts b/src/utils/DynamicContent/formatters/IntegerDe.ts
index b11e6e5fc..d4a5fcf35 100644
--- a/src/utils/DynamicContent/formatters/IntegerDe.ts
+++ b/src/utils/DynamicContent/formatters/IntegerDe.ts
@@ -1,6 +1,6 @@
+import formatter from 'format-number';
 import { Integer } from '@src/utils/DynamicContent/formatters/Integer';
 import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
-import formatter from 'format-number';
 
 export class IntegerDe implements Integer {
 
diff --git a/src/utils/DynamicContent/formatters/IntegerEn.ts b/src/utils/DynamicContent/formatters/IntegerEn.ts
index b8c46c304..b3ea626c4 100644
--- a/src/utils/DynamicContent/formatters/IntegerEn.ts
+++ b/src/utils/DynamicContent/formatters/IntegerEn.ts
@@ -1,6 +1,6 @@
+import formatter from 'format-number';
 import { Integer } from '@src/utils/DynamicContent/formatters/Integer';
 import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
-import formatter from 'format-number';
 
 export class IntegerEn implements Integer {
 
diff --git a/src/utils/DynamicContent/generators/CampaignDaySentence.ts b/src/utils/DynamicContent/generators/CampaignDaySentence.ts
index cb139ecf8..cfa4b7ca0 100644
--- a/src/utils/DynamicContent/generators/CampaignDaySentence.ts
+++ b/src/utils/DynamicContent/generators/CampaignDaySentence.ts
@@ -1,7 +1,7 @@
-import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
-import TimeRange from '@src/utils/TimeRange';
 import { Translator } from '@src/Translator';
 import { Ordinal } from '@src/utils/DynamicContent/formatters/Ordinal';
+import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
+import TimeRange from '@src/utils/TimeRange';
 
 export class CampaignDaySentence implements TextGenerator {
 	private _ordinal: Ordinal;
diff --git a/src/utils/DynamicContent/generators/CurrentDate.ts b/src/utils/DynamicContent/generators/CurrentDate.ts
index 49ea7b864..4175aa1ad 100644
--- a/src/utils/DynamicContent/generators/CurrentDate.ts
+++ b/src/utils/DynamicContent/generators/CurrentDate.ts
@@ -1,6 +1,6 @@
-import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
-import { Ordinal } from '@src/utils/DynamicContent/formatters/Ordinal';
 import { Translator } from '@src/Translator';
+import { Ordinal } from '@src/utils/DynamicContent/formatters/Ordinal';
+import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
 
 export class CurrentDate implements TextGenerator<Date> {
 	private readonly _translator: Translator;
diff --git a/src/utils/DynamicContent/generators/CurrentTime.ts b/src/utils/DynamicContent/generators/CurrentTime.ts
index ea0af344c..5847e44be 100644
--- a/src/utils/DynamicContent/generators/CurrentTime.ts
+++ b/src/utils/DynamicContent/generators/CurrentTime.ts
@@ -1,5 +1,5 @@
-import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
 import { Time } from '@src/utils/DynamicContent/formatters/Time';
+import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
 
 export class CurrentTime implements TextGenerator<Date> {
 	private _timeFormatter: Time;
diff --git a/src/utils/DynamicContent/generators/DayName.ts b/src/utils/DynamicContent/generators/DayName.ts
index 82eea9293..86add504d 100644
--- a/src/utils/DynamicContent/generators/DayName.ts
+++ b/src/utils/DynamicContent/generators/DayName.ts
@@ -1,5 +1,5 @@
-import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
 import { Translator } from '@src/Translator';
+import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
 
 const specialDayNameMessageKeys: { [ key: string ]: string } = {
 	'12/06': 'day-name-st-nicholas-day',
diff --git a/src/utils/DynamicContent/generators/DaysLeftSentence.ts b/src/utils/DynamicContent/generators/DaysLeftSentence.ts
index aa8d3631d..6b6e7e5cc 100644
--- a/src/utils/DynamicContent/generators/DaysLeftSentence.ts
+++ b/src/utils/DynamicContent/generators/DaysLeftSentence.ts
@@ -1,6 +1,6 @@
-import TimeRange from '@src/utils/TimeRange';
 import { Translator } from '@src/Translator';
 import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
+import TimeRange from '@src/utils/TimeRange';
 
 /**
  * Return a sentence that describes how many days are left in the campaign.
diff --git a/src/utils/DynamicContent/generators/DonorsNeededSentence.ts b/src/utils/DynamicContent/generators/DonorsNeededSentence.ts
index d73ad80aa..f99f077d9 100644
--- a/src/utils/DynamicContent/generators/DonorsNeededSentence.ts
+++ b/src/utils/DynamicContent/generators/DonorsNeededSentence.ts
@@ -1,5 +1,5 @@
-import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
 import { Translator } from '@src/Translator';
+import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
 
 export class DonorsNeededSentence implements TextGenerator {
 	private readonly _translator: Translator;
diff --git a/src/utils/DynamicContent/generators/ProgressBarContent.ts b/src/utils/DynamicContent/generators/ProgressBarContent.ts
index a09bf653d..b9dfc0287 100644
--- a/src/utils/DynamicContent/generators/ProgressBarContent.ts
+++ b/src/utils/DynamicContent/generators/ProgressBarContent.ts
@@ -1,6 +1,6 @@
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import { Translator } from '@src/Translator';
 import { DynamicProgressBarContent } from '@src/utils/DynamicContent/DynamicProgressBarContent';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 
 export class ProgressBarContent implements DynamicProgressBarContent {
 	private readonly _donationTarget: number;
diff --git a/src/utils/DynamicContent/generators/VisitorsVsDonorsSentence.ts b/src/utils/DynamicContent/generators/VisitorsVsDonorsSentence.ts
index 010c9e4f2..25b0d7aa9 100644
--- a/src/utils/DynamicContent/generators/VisitorsVsDonorsSentence.ts
+++ b/src/utils/DynamicContent/generators/VisitorsVsDonorsSentence.ts
@@ -1,6 +1,6 @@
-import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
 import { Translator } from '@src/Translator';
 import { Integer } from '@src/utils/DynamicContent/formatters/Integer';
+import { TextGenerator } from '@src/utils/DynamicContent/generators/TextGenerator';
 
 export class VisitorsVsDonorsSentence implements TextGenerator {
 	private readonly _translator: Translator;
diff --git a/src/utils/FormItemsBuilder/FormItemsBuilder.ts b/src/utils/FormItemsBuilder/FormItemsBuilder.ts
index cefc47008..e31446567 100644
--- a/src/utils/FormItemsBuilder/FormItemsBuilder.ts
+++ b/src/utils/FormItemsBuilder/FormItemsBuilder.ts
@@ -1,7 +1,7 @@
 import { Translator } from '@src/Translator';
-import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
-import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter';
+import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
+import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 
 export default class FormItemsBuilder {
 	private readonly _formItems: DonationFormItems;
diff --git a/src/utils/FormModel/FormModel.ts b/src/utils/FormModel/FormModel.ts
index 193c03ed3..bc716e9ee 100644
--- a/src/utils/FormModel/FormModel.ts
+++ b/src/utils/FormModel/FormModel.ts
@@ -1,6 +1,6 @@
-import { Validity } from '@src/utils/FormModel/Validity';
 import { ComputedRef, Ref } from 'vue';
 import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
+import { Validity } from '@src/utils/FormModel/Validity';
 
 export interface FormModel {
 	interval: Ref<string>;
diff --git a/src/utils/LocalCloseTracker.ts b/src/utils/LocalCloseTracker.ts
index 85bcdda23..92da7f74b 100644
--- a/src/utils/LocalCloseTracker.ts
+++ b/src/utils/LocalCloseTracker.ts
@@ -1,6 +1,6 @@
 import { CloseChoices } from '@src/domain/CloseChoices';
-import hasLocalStorage from '@src/utils/hasLocalStorage';
 import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
+import hasLocalStorage from '@src/utils/hasLocalStorage';
 
 export interface LocalCloseTracker {
 	setItem( feature: TrackingFeatureName, closeChoice: CloseChoices ): void;
diff --git a/src/utils/LocalImpressionCount.ts b/src/utils/LocalImpressionCount.ts
index 65b9aa017..8852339fa 100644
--- a/src/utils/LocalImpressionCount.ts
+++ b/src/utils/LocalImpressionCount.ts
@@ -1,6 +1,6 @@
-import hasLocalStorage from './hasLocalStorage';
 import { ImpressionCount } from '@src/utils/ImpressionCount';
 import { RuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
+import hasLocalStorage from './hasLocalStorage';
 
 export class LocalImpressionCount implements ImpressionCount {
 	private readonly _bannerName: string;
diff --git a/src/utils/LocaleFactory.ts b/src/utils/LocaleFactory.ts
index f57bd60cf..9a75e2994 100644
--- a/src/utils/LocaleFactory.ts
+++ b/src/utils/LocaleFactory.ts
@@ -1,5 +1,5 @@
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import { Formatters } from '@src/utils/DynamicContent/Formatters';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
 
 export interface LocaleFactory {
diff --git a/src/utils/LocaleFactory/LocaleFactoryDe.ts b/src/utils/LocaleFactory/LocaleFactoryDe.ts
index 3f1d40004..c271a5bf7 100644
--- a/src/utils/LocaleFactory/LocaleFactoryDe.ts
+++ b/src/utils/LocaleFactory/LocaleFactoryDe.ts
@@ -1,12 +1,12 @@
-import { LocaleFactory } from '@src/utils/LocaleFactory';
-import { CurrencyDe } from '@src/utils/DynamicContent/formatters/CurrencyDe';
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
+import { UseOfFundsDeLoader } from '@environment/UseOfFundsDeLoader';
 import { Formatters } from '@src/utils/DynamicContent/Formatters';
-import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
-import { OrdinalDe } from '@src/utils/DynamicContent/formatters/OrdinalDe';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
+import { CurrencyDe } from '@src/utils/DynamicContent/formatters/CurrencyDe';
 import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
-import { UseOfFundsDeLoader } from '@environment/UseOfFundsDeLoader';
+import { OrdinalDe } from '@src/utils/DynamicContent/formatters/OrdinalDe';
 import { TimeDe } from '@src/utils/DynamicContent/formatters/TimeDe';
+import { LocaleFactory } from '@src/utils/LocaleFactory';
+import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
 
 export class LocaleFactoryDe implements LocaleFactory {
 	private readonly _currencyFormatter: Currency;
diff --git a/src/utils/LocaleFactory/LocaleFactoryEn.ts b/src/utils/LocaleFactory/LocaleFactoryEn.ts
index 577b22254..5c279b938 100644
--- a/src/utils/LocaleFactory/LocaleFactoryEn.ts
+++ b/src/utils/LocaleFactory/LocaleFactoryEn.ts
@@ -1,12 +1,12 @@
-import { LocaleFactory } from '@src/utils/LocaleFactory';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
+import { UseOfFundsEnLoader } from '@environment/UseOfFundsEnLoader';
 import { Formatters } from '@src/utils/DynamicContent/Formatters';
-import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
-import { OrdinalEn } from '@src/utils/DynamicContent/formatters/OrdinalEn';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
-import { UseOfFundsEnLoader } from '@environment/UseOfFundsEnLoader';
+import { OrdinalEn } from '@src/utils/DynamicContent/formatters/OrdinalEn';
 import { TimeEn } from '@src/utils/DynamicContent/formatters/TimeEn';
+import { LocaleFactory } from '@src/utils/LocaleFactory';
+import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
 
 export class LocaleFactoryEn implements LocaleFactory {
 	private readonly _currencyFormatter: Currency;
diff --git a/src/utils/LocaleFactory/LocaleFactoryWpDe.ts b/src/utils/LocaleFactory/LocaleFactoryWpDe.ts
index c11221d9f..e03d82cbe 100644
--- a/src/utils/LocaleFactory/LocaleFactoryWpDe.ts
+++ b/src/utils/LocaleFactory/LocaleFactoryWpDe.ts
@@ -1,12 +1,12 @@
-import { LocaleFactory } from '@src/utils/LocaleFactory';
-import { CurrencyDe } from '@src/utils/DynamicContent/formatters/CurrencyDe';
-import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
 import { Formatters } from '@src/utils/DynamicContent/Formatters';
-import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
-import { OrdinalDe } from '@src/utils/DynamicContent/formatters/OrdinalDe';
+import { Currency } from '@src/utils/DynamicContent/formatters/Currency';
+import { CurrencyDe } from '@src/utils/DynamicContent/formatters/CurrencyDe';
 import { IntegerDe } from '@src/utils/DynamicContent/formatters/IntegerDe';
-import { DeJSONFundsContentLoader } from '@src/utils/UseOfFunds/DeJSONFundsContentLoader';
+import { OrdinalDe } from '@src/utils/DynamicContent/formatters/OrdinalDe';
 import { TimeDe } from '@src/utils/DynamicContent/formatters/TimeDe';
+import { LocaleFactory } from '@src/utils/LocaleFactory';
+import { DeJSONFundsContentLoader } from '@src/utils/UseOfFunds/DeJSONFundsContentLoader';
+import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
 
 export class LocaleFactoryWpDe implements LocaleFactory {
 	private readonly _currencyFormatter: Currency;
diff --git a/src/utils/SizeIssueChecker/WindowSizeIssueChecker.ts b/src/utils/SizeIssueChecker/WindowSizeIssueChecker.ts
index e56a57645..76dd3bbf5 100644
--- a/src/utils/SizeIssueChecker/WindowSizeIssueChecker.ts
+++ b/src/utils/SizeIssueChecker/WindowSizeIssueChecker.ts
@@ -1,5 +1,5 @@
-import { Vector2 } from '@src/utils/Vector2';
 import { SizeIssueChecker } from '@src/utils/SizeIssueChecker/SizeIssueChecker';
+import { Vector2 } from '@src/utils/Vector2';
 
 export class WindowSizeIssueChecker implements SizeIssueChecker {
 	private readonly _minimumAllowedWidth: number;
diff --git a/src/utils/UseOfFunds/DeJSONFundsContentLoader.ts b/src/utils/UseOfFunds/DeJSONFundsContentLoader.ts
index a720c3e9b..1ac8ed363 100644
--- a/src/utils/UseOfFunds/DeJSONFundsContentLoader.ts
+++ b/src/utils/UseOfFunds/DeJSONFundsContentLoader.ts
@@ -1,6 +1,6 @@
-import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
-import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import * as useOfFundsContent from 'fundraising-frontend-content/i18n/de_DE/data/use_of_funds_content.json';
+import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
 
 export class DeJSONFundsContentLoader implements FundsContentLoader {
 
diff --git a/src/utils/UseOfFunds/EnJSONFundsContentLoader.ts b/src/utils/UseOfFunds/EnJSONFundsContentLoader.ts
index 3c3292cd4..1ad185a7b 100644
--- a/src/utils/UseOfFunds/EnJSONFundsContentLoader.ts
+++ b/src/utils/UseOfFunds/EnJSONFundsContentLoader.ts
@@ -1,6 +1,6 @@
-import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
-import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import * as useOfFundsContent from 'fundraising-frontend-content/i18n/en_GB/data/use_of_funds_content.json';
+import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
 
 export class EnJSONFundsContentLoader implements FundsContentLoader {
 
diff --git a/src/utils/UseOfFunds/HtmlFundsContentLoader.ts b/src/utils/UseOfFunds/HtmlFundsContentLoader.ts
index 9f20e2973..5dc88d616 100644
--- a/src/utils/UseOfFunds/HtmlFundsContentLoader.ts
+++ b/src/utils/UseOfFunds/HtmlFundsContentLoader.ts
@@ -1,5 +1,5 @@
-import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
 import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
+import { FundsContentLoader } from '@src/utils/UseOfFunds/FundsContentLoader';
 
 export class HtmlFundsContentLoader implements FundsContentLoader {
 	public getContent(): UseOfFundsContent {
diff --git a/src/validation/DonationFormValidator.ts b/src/validation/DonationFormValidator.ts
index b4de2577e..aa49aaee7 100644
--- a/src/validation/DonationFormValidator.ts
+++ b/src/validation/DonationFormValidator.ts
@@ -1,9 +1,9 @@
+import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
 import { FormModel } from '@src/utils/FormModel/FormModel';
 import { Validity } from '@src/utils/FormModel/Validity';
+import { FormValidator } from '@src/validation/FormValidator';
 import { validateAmount } from '@src/validation/validateAmount';
 import { validateStringIsNotEmpty } from '@src/validation/validateStringIsNotEmpty';
-import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
-import { FormValidator } from '@src/validation/FormValidator';
 
 export class DonationFormValidator implements FormValidator {
 	private _formModel: FormModel;
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerCtrl.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerCtrl.spec.ts
index dfc949f58..2757a232e 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerCtrl.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerCtrl.spec.ts
@@ -1,22 +1,22 @@
-import { beforeEach, describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test } from 'vitest';
 import Banner from '@banners/desktop/C24_WMDE_Desktop_DE_06/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_06/components/FallbackBanner.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_06/components/FallbackBanner.spec.ts
index d5c0154be..14acf3b0f 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_06/components/FallbackBanner.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_06/components/FallbackBanner.spec.ts
@@ -1,14 +1,14 @@
-import { describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { describe, test } from 'vitest';
 import FallbackBanner from '@banners/desktop/C24_WMDE_Desktop_DE_06/components/FallbackBanner.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
-import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Tracker } from '@src/tracking/Tracker';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { fallbackBannerFeatures, submitFeatures } from '@test/features/FallbackBanner';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 const translator = ( key: string ): string => key;
 
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerCtrl.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerCtrl.spec.ts
index d4f3ed930..4250b44f2 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerCtrl.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerCtrl.spec.ts
@@ -1,12 +1,16 @@
-import { beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import {
 	bannerContentAnimatedTextFeatures,
 	bannerContentAverageDonationFeatures,
@@ -14,18 +18,14 @@ import {
 	bannerContentDisplaySwitchFeatures,
 	bannerContentFeatures
 } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { softCloseSubmitTrackingFeaturesDesktop } from '@test/features/SoftCloseSubmitTrackingDesktop';
-import { Tracker } from '@src/tracking/Tracker';
-import { Timer } from '@src/utils/Timer';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerVar.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerVar.spec.ts
index 28a4dd84a..79d66dc11 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerVar.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerVar.spec.ts
@@ -1,25 +1,25 @@
-import { beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/desktop/C24_WMDE_Desktop_DE_08/components/BannerVar.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { softCloseSubmitTrackingFeaturesDesktop } from '@test/features/SoftCloseSubmitTrackingDesktop';
-import { Tracker } from '@src/tracking/Tracker';
-import { Timer } from '@src/utils/Timer';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/FallbackBanner.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/FallbackBanner.spec.ts
index b68d62bb6..0cfb41b52 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/FallbackBanner.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_08/components/FallbackBanner.spec.ts
@@ -1,14 +1,14 @@
-import { describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { describe, test } from 'vitest';
 import FallbackBanner from '@banners/desktop/C24_WMDE_Desktop_DE_08/components/FallbackBanner.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
-import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Tracker } from '@src/tracking/Tracker';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { fallbackBannerFeatures, submitFeatures } from '@test/features/FallbackBanner';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 const translator = ( key: string ): string => key;
 
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerCtrl.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerCtrl.spec.ts
index 2076a4a33..dea45fb35 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerCtrl.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerCtrl.spec.ts
@@ -1,25 +1,25 @@
-import { beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { softCloseSubmitTrackingFeaturesDesktop } from '@test/features/SoftCloseSubmitTrackingDesktop';
-import { Tracker } from '@src/tracking/Tracker';
-import { Timer } from '@src/utils/Timer';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerVar.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerVar.spec.ts
index 950f35f28..37acad462 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerVar.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerVar.spec.ts
@@ -1,25 +1,25 @@
-import { beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/desktop/C24_WMDE_Desktop_DE_09/components/BannerVar.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { softCloseSubmitTrackingFeaturesDesktop } from '@test/features/SoftCloseSubmitTrackingDesktop';
-import { Tracker } from '@src/tracking/Tracker';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/FallbackBanner.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/FallbackBanner.spec.ts
index e43797d7a..b9805dd73 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/FallbackBanner.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_09/components/FallbackBanner.spec.ts
@@ -1,14 +1,14 @@
-import { describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { describe, test } from 'vitest';
 import FallbackBanner from '@banners/desktop/C24_WMDE_Desktop_DE_09/components/FallbackBanner.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
-import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Tracker } from '@src/tracking/Tracker';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { fallbackBannerFeatures, submitFeatures } from '@test/features/FallbackBanner';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 const translator = ( key: string ): string => key;
 
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerCtrl.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerCtrl.spec.ts
index 276555e5a..092ee3c75 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerCtrl.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerCtrl.spec.ts
@@ -1,25 +1,25 @@
-import { beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { softCloseSubmitTrackingFeaturesDesktop } from '@test/features/SoftCloseSubmitTrackingDesktop';
-import { Tracker } from '@src/tracking/Tracker';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerVar.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerVar.spec.ts
index b8f0c9fe6..39da3d1f8 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerVar.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerVar.spec.ts
@@ -1,25 +1,25 @@
-import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/desktop/C24_WMDE_Desktop_DE_10/components/BannerVar.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { softCloseSubmitTrackingFeaturesDesktop } from '@test/features/SoftCloseSubmitTrackingDesktop';
-import { Tracker } from '@src/tracking/Tracker';
-import { Timer } from '@src/utils/Timer';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/FallbackBanner.spec.ts b/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/FallbackBanner.spec.ts
index fbd00ec4f..1590cd91a 100644
--- a/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/FallbackBanner.spec.ts
+++ b/test/banners/desktop/C24_WMDE_Desktop_DE_10/components/FallbackBanner.spec.ts
@@ -1,15 +1,15 @@
-import { describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { describe, test } from 'vitest';
 import FallbackBanner from '@banners/desktop/C24_WMDE_Desktop_DE_10/components/FallbackBanner.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
-import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Tracker } from '@src/tracking/Tracker';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
-import { fallbackBannerFeatures, submitFeatures } from '@test/features/FallbackBanner';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Timer } from '@src/utils/Timer';
+import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { fallbackBannerFeatures, submitFeatures } from '@test/features/FallbackBanner';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 const translator = ( key: string ): string => key;
 
diff --git a/test/banners/dynamicCampaignContent.ts b/test/banners/dynamicCampaignContent.ts
index 3fdb991be..7dd475b9f 100644
--- a/test/banners/dynamicCampaignContent.ts
+++ b/test/banners/dynamicCampaignContent.ts
@@ -1,5 +1,5 @@
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { DateAndTime } from '@src/utils/DynamicContent/DateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 export function newDynamicContent(): DynamicContent {
 	return {
diff --git a/test/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerCtrl.spec.ts b/test/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerCtrl.spec.ts
index 48efa9afa..7bc192995 100644
--- a/test/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerCtrl.spec.ts
+++ b/test/banners/english/C24_WMDE_Desktop_EN_02b/components/BannerCtrl.spec.ts
@@ -1,23 +1,23 @@
-import { beforeEach, describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test } from 'vitest';
 import Banner from '@banners/english/C24_WMDE_Desktop_EN_02b/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { Timer } from '@src/utils/Timer';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/english/C24_WMDE_Desktop_EN_02b/components/FallbackBanner.spec.ts b/test/banners/english/C24_WMDE_Desktop_EN_02b/components/FallbackBanner.spec.ts
index b8b1645c6..591cccd01 100644
--- a/test/banners/english/C24_WMDE_Desktop_EN_02b/components/FallbackBanner.spec.ts
+++ b/test/banners/english/C24_WMDE_Desktop_EN_02b/components/FallbackBanner.spec.ts
@@ -1,15 +1,15 @@
-import { describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { describe, test } from 'vitest';
 import FallbackBanner from '@banners/english/C24_WMDE_Desktop_EN_02b/components/FallbackBanner.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
-import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Tracker } from '@src/tracking/Tracker';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { Timer } from '@src/utils/Timer';
+import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { dynamicContentFeatures, fallbackBannerFeatures, submitFeatures } from '@test/features/FallbackBanner';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 const translator = ( key: string ): string => key;
 
diff --git a/test/banners/english/C24_WMDE_Desktop_EN_03/components/BannerCtrl.spec.ts b/test/banners/english/C24_WMDE_Desktop_EN_03/components/BannerCtrl.spec.ts
index e7d64ead7..083dbb386 100644
--- a/test/banners/english/C24_WMDE_Desktop_EN_03/components/BannerCtrl.spec.ts
+++ b/test/banners/english/C24_WMDE_Desktop_EN_03/components/BannerCtrl.spec.ts
@@ -1,23 +1,23 @@
-import { beforeEach, describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test } from 'vitest';
 import Banner from '@banners/english/C24_WMDE_Desktop_EN_03/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { Timer } from '@src/utils/Timer';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/english/C24_WMDE_Desktop_EN_03/components/BannerVar.spec.ts b/test/banners/english/C24_WMDE_Desktop_EN_03/components/BannerVar.spec.ts
index c1fd85742..441b6d982 100644
--- a/test/banners/english/C24_WMDE_Desktop_EN_03/components/BannerVar.spec.ts
+++ b/test/banners/english/C24_WMDE_Desktop_EN_03/components/BannerVar.spec.ts
@@ -1,24 +1,24 @@
-import { beforeEach, describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test } from 'vitest';
 import Banner from '@banners/english/C24_WMDE_Desktop_EN_03/components/BannerVar.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { donationFormTransactionFeeFeatures } from '@test/features/forms/MainDonation_TransactionFee';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { donationFormTransactionFeeFeatures } from '@test/features/forms/MainDonation_TransactionFee';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string, context: any ): string => context ? `${key} -- ${Object.entries( context )}` : key;
diff --git a/test/banners/english/C24_WMDE_Desktop_EN_03/components/FallbackBanner.spec.ts b/test/banners/english/C24_WMDE_Desktop_EN_03/components/FallbackBanner.spec.ts
index 5f812ca06..f6a65881d 100644
--- a/test/banners/english/C24_WMDE_Desktop_EN_03/components/FallbackBanner.spec.ts
+++ b/test/banners/english/C24_WMDE_Desktop_EN_03/components/FallbackBanner.spec.ts
@@ -1,15 +1,15 @@
-import { describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { describe, test } from 'vitest';
 import FallbackBanner from '@banners/english/C24_WMDE_Desktop_EN_03/components/FallbackBanner.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
-import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Tracker } from '@src/tracking/Tracker';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { Timer } from '@src/utils/Timer';
+import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { dynamicContentFeatures, fallbackBannerFeatures, submitFeatures } from '@test/features/FallbackBanner';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 const translator = ( key: string ): string => key;
 
diff --git a/test/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerCtrl.spec.ts b/test/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerCtrl.spec.ts
index 65576eba8..7345ce78c 100644
--- a/test/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerCtrl.spec.ts
+++ b/test/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerCtrl.spec.ts
@@ -1,26 +1,26 @@
-import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { formItems } from '@test/banners/formItems';
-import { softCloseFeatures } from '@test/features/SoftCloseMobile';
-import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
-import { miniBannerFeatures } from '@test/features/MiniBanner';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { fullPageBannerFeatures } from '@test/features/FullPageBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
-import { Tracker } from '@src/tracking/Tracker';
-import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures } from '@test/features/BannerContent';
+import { miniBannerFeatures } from '@test/features/MiniBanner';
+import { softCloseFeatures } from '@test/features/SoftCloseMobile';
 import { softCloseSubmitTrackingFeatures } from '@test/features/SoftCloseSubmitTracking';
-import { Timer } from '@src/utils/Timer';
+import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 let pageScroller: PageScroller;
 let tracker: Tracker;
diff --git a/test/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerVar.spec.ts b/test/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerVar.spec.ts
index 5055e3334..a1e10cd16 100644
--- a/test/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerVar.spec.ts
+++ b/test/banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerVar.spec.ts
@@ -1,26 +1,26 @@
-import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/mobile/C24_WMDE_Mobile_DE_06/components/BannerVar.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { formItems } from '@test/banners/formItems';
-import { softCloseFeatures } from '@test/features/SoftCloseMobile';
-import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
-import { miniBannerFeatures } from '@test/features/MiniBanner';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { fullPageBannerFeatures } from '@test/features/FullPageBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
-import { Tracker } from '@src/tracking/Tracker';
-import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures } from '@test/features/BannerContent';
+import { miniBannerFeatures } from '@test/features/MiniBanner';
+import { softCloseFeatures } from '@test/features/SoftCloseMobile';
 import { softCloseSubmitTrackingFeatures } from '@test/features/SoftCloseSubmitTracking';
-import { Timer } from '@src/utils/Timer';
+import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 let pageScroller: PageScroller;
 let tracker: Tracker;
diff --git a/test/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerCtrl.spec.ts b/test/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerCtrl.spec.ts
index ed7e33027..975eadea6 100644
--- a/test/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerCtrl.spec.ts
+++ b/test/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerCtrl.spec.ts
@@ -1,25 +1,25 @@
-import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { formItems } from '@test/banners/formItems';
-import { softCloseFeatures } from '@test/features/SoftCloseMobile';
-import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
-import { miniBannerFeatures } from '@test/features/MiniBanner';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { fullPageBannerFeatures } from '@test/features/FullPageBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
-import { Tracker } from '@src/tracking/Tracker';
-import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures } from '@test/features/BannerContent';
+import { miniBannerFeatures } from '@test/features/MiniBanner';
+import { softCloseFeatures } from '@test/features/SoftCloseMobile';
+import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { resetFormModel } from '@test/resetFormModel';
 
 let pageScroller: PageScroller;
 let tracker: Tracker;
diff --git a/test/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerVar.spec.ts b/test/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerVar.spec.ts
index 091f96803..4ae2e63bb 100644
--- a/test/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerVar.spec.ts
+++ b/test/banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerVar.spec.ts
@@ -1,26 +1,26 @@
-import { afterEach, beforeEach, describe, test, vi, it, expect } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
 import Banner from '@banners/mobile_english/C24_WMDE_Mobile_EN_01/components/BannerVar.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { UseOfFundsShownEvent } from '@src/tracking/events/UseOfFundsShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { formItems } from '@test/banners/formItems';
-import { softCloseFeatures } from '@test/features/SoftCloseMobile';
-import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
-import { miniBannerFeatures } from '@test/features/MiniBanner';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures } from '@test/features/BannerContent';
+import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { fullPageBannerFeatures } from '@test/features/FullPageBanner';
-import { formActionSwitchFeatures } from '@test/features/form_action_switch/MainDonation_UpgradeToYearlyButton';
-import { Tracker } from '@src/tracking/Tracker';
-import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures } from '@test/features/BannerContent';
-import { UseOfFundsShownEvent } from '@src/tracking/events/UseOfFundsShownEvent';
-import { Timer } from '@src/utils/Timer';
+import { miniBannerFeatures } from '@test/features/MiniBanner';
+import { softCloseFeatures } from '@test/features/SoftCloseMobile';
+import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 let pageScroller: PageScroller;
 let tracker: Tracker;
diff --git a/test/banners/pad/C24_WMDE_iPad_DE_01/components/BannerCtrl.spec.ts b/test/banners/pad/C24_WMDE_iPad_DE_01/components/BannerCtrl.spec.ts
index c234f0a28..f54d21089 100644
--- a/test/banners/pad/C24_WMDE_iPad_DE_01/components/BannerCtrl.spec.ts
+++ b/test/banners/pad/C24_WMDE_iPad_DE_01/components/BannerCtrl.spec.ts
@@ -1,22 +1,22 @@
-import { afterEach, beforeEach, describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, test } from 'vitest';
 import Banner from '@banners/pad/C24_WMDE_iPad_DE_01/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
-import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { bannerContentAnimatedTextFeatures, bannerContentFeatures } from '@test/features/BannerContent';
-import { resetFormModel } from '@test/resetFormModel';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
+import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/pad/C24_WMDE_iPad_DE_01/components/BannerVar.spec.ts b/test/banners/pad/C24_WMDE_iPad_DE_01/components/BannerVar.spec.ts
index 909e12f39..d2631c015 100644
--- a/test/banners/pad/C24_WMDE_iPad_DE_01/components/BannerVar.spec.ts
+++ b/test/banners/pad/C24_WMDE_iPad_DE_01/components/BannerVar.spec.ts
@@ -1,22 +1,22 @@
-import { afterEach, beforeEach, describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, test } from 'vitest';
 import Banner from '@banners/pad/C24_WMDE_iPad_DE_01/components/BannerVar.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
-import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { bannerContentAnimatedTextFeatures, bannerContentFeatures } from '@test/features/BannerContent';
-import { resetFormModel } from '@test/resetFormModel';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { Timer } from '@src/utils/Timer';
+import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/thank_you/components/BannerCtrl.de.spec.ts b/test/banners/thank_you/components/BannerCtrl.de.spec.ts
index bd1e3c4c6..c7fb73b09 100644
--- a/test/banners/thank_you/components/BannerCtrl.de.spec.ts
+++ b/test/banners/thank_you/components/BannerCtrl.de.spec.ts
@@ -1,19 +1,19 @@
-import { describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { CloseChoices } from '@src/domain/CloseChoices';
+import { describe, expect, it, vi } from 'vitest';
 import BannerCtrl from '@banners/thank_you/components/BannerCtrl.de.vue';
-import MiniBannerTextWin from '@banners/thank_you/content/win/MiniBannerText.de.vue';
-import MiniBannerSlidesWin from '@banners/thank_you/content/win/MiniBannerSlides.de.vue';
-import FullPageBannerTextWin from '@banners/thank_you/content/win/FullPageBannerText.de.vue';
-import MiniBannerTextLose from '@banners/thank_you/content/lose/MiniBannerText.de.vue';
-import MiniBannerSlidesLose from '@banners/thank_you/content/lose/MiniBannerSlides.de.vue';
 import FullPageBannerTextLose from '@banners/thank_you/content/lose/FullPageBannerText.de.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import MiniBannerSlidesLose from '@banners/thank_you/content/lose/MiniBannerSlides.de.vue';
+import MiniBannerTextLose from '@banners/thank_you/content/lose/MiniBannerText.de.vue';
+import FullPageBannerTextWin from '@banners/thank_you/content/win/FullPageBannerText.de.vue';
+import MiniBannerSlidesWin from '@banners/thank_you/content/win/MiniBannerSlides.de.vue';
+import MiniBannerTextWin from '@banners/thank_you/content/win/MiniBannerText.de.vue';
 import { MembershipFormActions } from '@banners/thank_you/MembershipFormActions';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { TimerStub } from '@test/fixtures/TimerStub';
 
 const formActions: MembershipFormActions = {
diff --git a/test/banners/thank_you/components/BannerCtrl.en.spec.ts b/test/banners/thank_you/components/BannerCtrl.en.spec.ts
index eed71281d..4a9f37359 100644
--- a/test/banners/thank_you/components/BannerCtrl.en.spec.ts
+++ b/test/banners/thank_you/components/BannerCtrl.en.spec.ts
@@ -1,19 +1,19 @@
-import { describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { CloseChoices } from '@src/domain/CloseChoices';
+import { describe, expect, it, vi } from 'vitest';
 import BannerCtrl from '@banners/thank_you/components/BannerCtrl.en.vue';
-import MiniBannerTextWin from '@banners/thank_you/content/win/MiniBannerText.en.vue';
-import MiniBannerSlidesWin from '@banners/thank_you/content/win/MiniBannerSlides.en.vue';
-import FullPageBannerTextWin from '@banners/thank_you/content/win/FullPageBannerText.en.vue';
-import MiniBannerTextLose from '@banners/thank_you/content/lose/MiniBannerText.en.vue';
-import MiniBannerSlidesLose from '@banners/thank_you/content/lose/MiniBannerSlides.en.vue';
 import FullPageBannerTextLose from '@banners/thank_you/content/lose/FullPageBannerText.en.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import MiniBannerSlidesLose from '@banners/thank_you/content/lose/MiniBannerSlides.en.vue';
+import MiniBannerTextLose from '@banners/thank_you/content/lose/MiniBannerText.en.vue';
+import FullPageBannerTextWin from '@banners/thank_you/content/win/FullPageBannerText.en.vue';
+import MiniBannerSlidesWin from '@banners/thank_you/content/win/MiniBannerSlides.en.vue';
+import MiniBannerTextWin from '@banners/thank_you/content/win/MiniBannerText.en.vue';
 import { MembershipFormActions } from '@banners/thank_you/MembershipFormActions';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { TimerStub } from '@test/fixtures/TimerStub';
 
 const formActions: MembershipFormActions = {
diff --git a/test/banners/thank_you/components/BannerVar.de.spec.ts b/test/banners/thank_you/components/BannerVar.de.spec.ts
index d9c2768d6..54415b270 100644
--- a/test/banners/thank_you/components/BannerVar.de.spec.ts
+++ b/test/banners/thank_you/components/BannerVar.de.spec.ts
@@ -1,19 +1,19 @@
-import { describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { CloseChoices } from '@src/domain/CloseChoices';
+import { describe, expect, it, vi } from 'vitest';
 import BannerCtrl from '@banners/thank_you/components/BannerVar.de.vue';
-import MiniBannerTextWin from '@banners/thank_you/content/win/MiniBannerText.de.vue';
-import MiniBannerSlidesWin from '@banners/thank_you/content/win/MiniBannerSlides.de.vue';
-import FullPageBannerTextWin from '@banners/thank_you/content/win/FullPageBannerText.de.vue';
-import MiniBannerTextLose from '@banners/thank_you/content/lose/MiniBannerText.de.vue';
-import MiniBannerSlidesLose from '@banners/thank_you/content/lose/MiniBannerSlides.de.vue';
 import FullPageBannerTextLose from '@banners/thank_you/content/lose/FullPageBannerText.de.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import MiniBannerSlidesLose from '@banners/thank_you/content/lose/MiniBannerSlides.de.vue';
+import MiniBannerTextLose from '@banners/thank_you/content/lose/MiniBannerText.de.vue';
+import FullPageBannerTextWin from '@banners/thank_you/content/win/FullPageBannerText.de.vue';
+import MiniBannerSlidesWin from '@banners/thank_you/content/win/MiniBannerSlides.de.vue';
+import MiniBannerTextWin from '@banners/thank_you/content/win/MiniBannerText.de.vue';
 import { MembershipFormActions } from '@banners/thank_you/MembershipFormActions';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { TimerStub } from '@test/fixtures/TimerStub';
 
 const formActions: MembershipFormActions = {
diff --git a/test/banners/thank_you/components/BannerVar.en.spec.ts b/test/banners/thank_you/components/BannerVar.en.spec.ts
index 44a19b7e4..ef192f245 100644
--- a/test/banners/thank_you/components/BannerVar.en.spec.ts
+++ b/test/banners/thank_you/components/BannerVar.en.spec.ts
@@ -1,19 +1,19 @@
-import { describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { CloseChoices } from '@src/domain/CloseChoices';
+import { describe, expect, it, vi } from 'vitest';
 import BannerCtrl from '@banners/thank_you/components/BannerVar.en.vue';
-import MiniBannerTextWin from '@banners/thank_you/content/win/MiniBannerText.en.vue';
-import MiniBannerSlidesWin from '@banners/thank_you/content/win/MiniBannerSlides.en.vue';
-import FullPageBannerTextWin from '@banners/thank_you/content/win/FullPageBannerText.en.vue';
-import MiniBannerTextLose from '@banners/thank_you/content/lose/MiniBannerText.en.vue';
-import MiniBannerSlidesLose from '@banners/thank_you/content/lose/MiniBannerSlides.en.vue';
 import FullPageBannerTextLose from '@banners/thank_you/content/lose/FullPageBannerText.en.vue';
-import { Tracker } from '@src/tracking/Tracker';
-import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import MiniBannerSlidesLose from '@banners/thank_you/content/lose/MiniBannerSlides.en.vue';
+import MiniBannerTextLose from '@banners/thank_you/content/lose/MiniBannerText.en.vue';
+import FullPageBannerTextWin from '@banners/thank_you/content/win/FullPageBannerText.en.vue';
+import MiniBannerSlidesWin from '@banners/thank_you/content/win/MiniBannerSlides.en.vue';
+import MiniBannerTextWin from '@banners/thank_you/content/win/MiniBannerText.en.vue';
 import { MembershipFormActions } from '@banners/thank_you/MembershipFormActions';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { ThankYouModalShownEvent } from '@src/tracking/events/ThankYouModalShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { TimerStub } from '@test/fixtures/TimerStub';
 
 const formActions: MembershipFormActions = {
diff --git a/test/banners/thank_you/components/FullPageBanner.spec.ts b/test/banners/thank_you/components/FullPageBanner.spec.ts
index 8c656ce48..27f37f817 100644
--- a/test/banners/thank_you/components/FullPageBanner.spec.ts
+++ b/test/banners/thank_you/components/FullPageBanner.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { describe, expect, it, vi } from 'vitest';
 import FullPageBanner from '@banners/thank_you/components/FullPageBanner.vue';
 import { Tracker } from '@src/tracking/Tracker';
 
diff --git a/test/banners/thank_you/components/MembershipButton.spec.ts b/test/banners/thank_you/components/MembershipButton.spec.ts
index 3ec7c1d70..0266efd92 100644
--- a/test/banners/thank_you/components/MembershipButton.spec.ts
+++ b/test/banners/thank_you/components/MembershipButton.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { shallowMount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import MembershipButton from '@banners/thank_you/components/MembershipButton.vue';
 import { MembershipFormActions } from '@banners/thank_you/MembershipFormActions';
 
diff --git a/test/banners/thank_you/components/MiniBanner.spec.ts b/test/banners/thank_you/components/MiniBanner.spec.ts
index 9e60f2b3f..53bf8d647 100644
--- a/test/banners/thank_you/components/MiniBanner.spec.ts
+++ b/test/banners/thank_you/components/MiniBanner.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import MiniBanner from '@banners/thank_you/components/MiniBanner.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 
diff --git a/test/banners/thank_you/components/ProgressBar.spec.ts b/test/banners/thank_you/components/ProgressBar.spec.ts
index 225f92890..aac0495aa 100644
--- a/test/banners/thank_you/components/ProgressBar.spec.ts
+++ b/test/banners/thank_you/components/ProgressBar.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { shallowMount, VueWrapper } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import ProgressBar from '@banners/thank_you/components/ProgressBar.vue';
 
 describe( 'ProgressBar.vue', () => {
diff --git a/test/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerCtrl.spec.ts b/test/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerCtrl.spec.ts
index 32e3e0817..aca468917 100644
--- a/test/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerCtrl.spec.ts
+++ b/test/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerCtrl.spec.ts
@@ -1,24 +1,24 @@
-import { beforeEach, describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test } from 'vitest';
 import Banner from '@banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
 import { setCookieImageFeatures } from '@test/features/SetCookieImage';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
+import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string ): string => key;
diff --git a/test/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerVar.spec.ts b/test/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerVar.spec.ts
index 11dac92d7..be3c3a4d6 100644
--- a/test/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerVar.spec.ts
+++ b/test/banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerVar.spec.ts
@@ -1,25 +1,25 @@
-import { beforeEach, describe, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, test } from 'vitest';
 import Banner from '@banners/wpde_desktop/C24_WPDE_Desktop_01/components/BannerVar.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { formItems } from '@test/banners/formItems';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { useOfFundsFeatures } from '@test/features/UseOfFunds';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
 import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
-import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
 import { donationFormTransactionFeeFeatures } from '@test/features/forms/MainDonation_TransactionFee';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
 import { bannerMainFeatures } from '@test/features/MainBanner';
-import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
 import { setCookieImageFeatures } from '@test/features/SetCookieImage';
-import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal';
-import { Timer } from '@src/utils/Timer';
+import { softCloseFeatures } from '@test/features/SoftCloseDesktop';
+import { useOfFundsFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 const translator = ( key: string, context: any ): string => context ? `${key} -- ${Object.entries( context )}` : key;
diff --git a/test/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.spec.ts b/test/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.spec.ts
index aab086dd9..490610427 100644
--- a/test/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.spec.ts
+++ b/test/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.spec.ts
@@ -1,24 +1,24 @@
-import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { formItems } from '@test/banners/formItems';
-import { softCloseFeatures } from '@test/features/SoftCloseMobile';
-import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
-import { miniBannerFeatures } from '@test/features/MiniBanner';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { fullPageBannerFeatures } from '@test/features/FullPageBanner';
+import { miniBannerFeatures } from '@test/features/MiniBanner';
 import { setCookieImageFeatures } from '@test/features/SetCookieImageMobile';
+import { softCloseFeatures } from '@test/features/SoftCloseMobile';
+import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 let pageScroller: PageScroller;
 const formModel = useFormModel();
diff --git a/test/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.spec.ts b/test/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.spec.ts
index 9daa9ece2..17321d8be 100644
--- a/test/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.spec.ts
+++ b/test/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.spec.ts
@@ -1,24 +1,24 @@
-import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, test, vi } from 'vitest';
 import Banner from '@banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.vue';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { PageScroller } from '@src/utils/PageScroller/PageScroller';
-import { useOfFundsContent } from '@test/banners/useOfFundsContent';
+import { Timer } from '@src/utils/Timer';
 import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { formItems } from '@test/banners/formItems';
-import { softCloseFeatures } from '@test/features/SoftCloseMobile';
-import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
-import { miniBannerFeatures } from '@test/features/MiniBanner';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { useOfFundsContent } from '@test/banners/useOfFundsContent';
 import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { fullPageBannerFeatures } from '@test/features/FullPageBanner';
+import { miniBannerFeatures } from '@test/features/MiniBanner';
 import { setCookieImageFeatures } from '@test/features/SetCookieImageMobile';
+import { softCloseFeatures } from '@test/features/SoftCloseMobile';
+import { useOfFundsFeatures, useOfFundsScrollFeatures } from '@test/features/UseOfFunds';
 import { TimerStub } from '@test/fixtures/TimerStub';
-import { Timer } from '@src/utils/Timer';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
+import { resetFormModel } from '@test/resetFormModel';
 
 let pageScroller: PageScroller;
 const formModel = useFormModel();
diff --git a/test/components/AlreadyDonatedModal/AlreadyDonatedModal.spec.ts b/test/components/AlreadyDonatedModal/AlreadyDonatedModal.spec.ts
index 74db04e59..df3f68887 100644
--- a/test/components/AlreadyDonatedModal/AlreadyDonatedModal.spec.ts
+++ b/test/components/AlreadyDonatedModal/AlreadyDonatedModal.spec.ts
@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import AlreadyDonatedModal from '@src/components/AlreadyDonatedModal/AlreadyDonatedModal.vue';
 import { AlreadyDonatedShownEvent } from '@src/tracking/events/AlreadyDonatedShownEvent';
 import { Tracker } from '@src/tracking/Tracker';
diff --git a/test/components/AnimatedText/AnimatedText.spec.ts b/test/components/AnimatedText/AnimatedText.spec.ts
index 4662358c8..dedf22230 100644
--- a/test/components/AnimatedText/AnimatedText.spec.ts
+++ b/test/components/AnimatedText/AnimatedText.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { shallowMount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import HighlightedText from '@src/components/AnimatedText/AnimatedText.vue';
 
 describe( 'AnimatedText.vue', () => {
diff --git a/test/components/BannerConductor/BannerConductor.spec.ts b/test/components/BannerConductor/BannerConductor.spec.ts
index 5afd8c44e..561eb5d08 100644
--- a/test/components/BannerConductor/BannerConductor.spec.ts
+++ b/test/components/BannerConductor/BannerConductor.spec.ts
@@ -1,21 +1,21 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
-import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
-import { PageStub } from '@test/fixtures/PageStub';
-import { ResizeHandlerStub } from '@test/fixtures/ResizeHandlerStub';
-import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { defineComponent, markRaw, nextTick } from 'vue';
+import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
 import { newBannerStateMachine } from '@src/components/BannerConductor/StateMachine/BannerStateMachine';
-import { BannerStateMachineSpy } from '@test/fixtures/BannerStateMachineSpy';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { Page } from '@src/page/Page';
-import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
-import { ReactiveProperty } from '@src/domain/StateMachine/ReactiveProperty';
 import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
+import { ReactiveProperty } from '@src/domain/StateMachine/ReactiveProperty';
+import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { Page } from '@src/page/Page';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { ResizeHandler } from '@src/utils/ResizeHandler';
+import { BannerStateMachineSpy } from '@test/fixtures/BannerStateMachineSpy';
+import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
+import { PageStub } from '@test/fixtures/PageStub';
+import { ResizeHandlerStub } from '@test/fixtures/ResizeHandlerStub';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 vi.mock( '@src/components/BannerConductor/StateMachine/BannerStateMachine', async () => {
 	const actual = await vi.importActual( '@src/components/BannerConductor/StateMachine/BannerStateMachine' );
diff --git a/test/components/BannerConductor/FallbackBannerConductor.spec.ts b/test/components/BannerConductor/FallbackBannerConductor.spec.ts
index 5ffb7e855..904b49d12 100644
--- a/test/components/BannerConductor/FallbackBannerConductor.spec.ts
+++ b/test/components/BannerConductor/FallbackBannerConductor.spec.ts
@@ -1,21 +1,21 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
-import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
-import { PageStub } from '@test/fixtures/PageStub';
-import { ResizeHandlerStub } from '@test/fixtures/ResizeHandlerStub';
-import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { defineComponent, markRaw, nextTick } from 'vue';
+import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue';
 import { newBannerStateMachine } from '@src/components/BannerConductor/StateMachine/BannerStateMachine';
-import { BannerStateMachineSpy } from '@test/fixtures/BannerStateMachineSpy';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { Page } from '@src/page/Page';
-import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
-import { ReactiveProperty } from '@src/domain/StateMachine/ReactiveProperty';
 import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
+import { ReactiveProperty } from '@src/domain/StateMachine/ReactiveProperty';
+import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { Page } from '@src/page/Page';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { ResizeHandler } from '@src/utils/ResizeHandler';
+import { BannerStateMachineSpy } from '@test/fixtures/BannerStateMachineSpy';
+import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
+import { PageStub } from '@test/fixtures/PageStub';
+import { ResizeHandlerStub } from '@test/fixtures/ResizeHandlerStub';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 vi.mock( '@src/components/BannerConductor/StateMachine/BannerStateMachine', async () => {
 	const actual = await vi.importActual( '@src/components/BannerConductor/StateMachine/BannerStateMachine' );
diff --git a/test/components/BannerConductor/StateMachine/BannerStateMachine.spec.ts b/test/components/BannerConductor/StateMachine/BannerStateMachine.spec.ts
index 31b51f9a8..b6da7d838 100644
--- a/test/components/BannerConductor/StateMachine/BannerStateMachine.spec.ts
+++ b/test/components/BannerConductor/StateMachine/BannerStateMachine.spec.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it, vitest } from 'vitest';
 import { ref } from 'vue';
-import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { newBannerStateMachine } from '@src/components/BannerConductor/StateMachine/BannerStateMachine';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 
 describe( 'BannerStateMachine', function () {
 
diff --git a/test/components/BannerConductor/StateMachine/states/ClosedState.spec.ts b/test/components/BannerConductor/StateMachine/states/ClosedState.spec.ts
index 149c4f0d7..d6962b4c1 100644
--- a/test/components/BannerConductor/StateMachine/states/ClosedState.spec.ts
+++ b/test/components/BannerConductor/StateMachine/states/ClosedState.spec.ts
@@ -1,12 +1,12 @@
-import { describe, it, vitest, expect } from 'vitest';
+import { describe, expect, it, vitest } from 'vitest';
 import { ClosedState } from '@src/components/BannerConductor/StateMachine/states/ClosedState';
+import { CloseChoices } from '@src/domain/CloseChoices';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { PageStub } from '@test/fixtures/PageStub';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
 import { ResizeHandlerStub } from '@test/fixtures/ResizeHandlerStub';
-import { CloseChoices } from '@src/domain/CloseChoices';
-import { TimerStub } from '@test/fixtures/TimerStub';
 import { TimerSpy } from '@test/fixtures/TimerSpy';
+import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 describe( 'ClosedState', function () {
 	it( 'tracks close event on enter', function () {
diff --git a/test/components/BannerConductor/StateMachine/states/NotShownState.spec.ts b/test/components/BannerConductor/StateMachine/states/NotShownState.spec.ts
index cba557832..bf72a80cf 100644
--- a/test/components/BannerConductor/StateMachine/states/NotShownState.spec.ts
+++ b/test/components/BannerConductor/StateMachine/states/NotShownState.spec.ts
@@ -3,10 +3,10 @@ import { NotShownState } from '@src/components/BannerConductor/StateMachine/stat
 import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
 import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { PageStub } from '@test/fixtures/PageStub';
-import { TrackerStub } from '@test/fixtures/TrackerStub';
 import { ResizeHandlerStub } from '@test/fixtures/ResizeHandlerStub';
-import { TimerStub } from '@test/fixtures/TimerStub';
 import { TimerSpy } from '@test/fixtures/TimerSpy';
+import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerStub } from '@test/fixtures/TrackerStub';
 
 describe( 'NotShownState', function () {
 	it( 'tracks not shown event on enter', function () {
diff --git a/test/components/BannerConductor/StateMachine/states/PendingState.spec.ts b/test/components/BannerConductor/StateMachine/states/PendingState.spec.ts
index fca973862..606b9bb7c 100644
--- a/test/components/BannerConductor/StateMachine/states/PendingState.spec.ts
+++ b/test/components/BannerConductor/StateMachine/states/PendingState.spec.ts
@@ -1,8 +1,8 @@
 import { beforeEach, describe, expect, it, vitest } from 'vitest';
 import { PendingState } from '@src/components/BannerConductor/StateMachine/states/PendingState';
 import { Page } from '@src/page/Page';
-import { TimerStub } from '@test/fixtures/TimerStub';
 import { TimerSpy } from '@test/fixtures/TimerSpy';
+import { TimerStub } from '@test/fixtures/TimerStub';
 
 describe( 'PendingState', function () {
 	let page: Page;
diff --git a/test/components/BannerConductor/StateMachine/states/ShowingState.spec.ts b/test/components/BannerConductor/StateMachine/states/ShowingState.spec.ts
index 2b19d52f4..ea54c4fb7 100644
--- a/test/components/BannerConductor/StateMachine/states/ShowingState.spec.ts
+++ b/test/components/BannerConductor/StateMachine/states/ShowingState.spec.ts
@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it, vitest } from 'vitest';
 import { ShowingState } from '@src/components/BannerConductor/StateMachine/states/ShowingState';
 import { Page } from '@src/page/Page';
 import { PageStub } from '@test/fixtures/PageStub';
-import { TimerStub } from '@test/fixtures/TimerStub';
 import { TimerSpy } from '@test/fixtures/TimerSpy';
+import { TimerStub } from '@test/fixtures/TimerStub';
 
 describe( 'ShowingState', function () {
 	let page: Page;
diff --git a/test/components/BannerConductor/StateMachine/states/VisibleState.spec.ts b/test/components/BannerConductor/StateMachine/states/VisibleState.spec.ts
index ce9dcde59..79651bdfe 100644
--- a/test/components/BannerConductor/StateMachine/states/VisibleState.spec.ts
+++ b/test/components/BannerConductor/StateMachine/states/VisibleState.spec.ts
@@ -1,9 +1,9 @@
 import { beforeEach, describe, expect, it, vitest } from 'vitest';
 import { VisibleState } from '@src/components/BannerConductor/StateMachine/states/VisibleState';
-import { PageStub } from '@test/fixtures/PageStub';
-import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
-import { Tracker } from '@src/tracking/Tracker';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
+import { PageStub } from '@test/fixtures/PageStub';
 
 describe( 'VisibleState', function () {
 	let tracker: Tracker;
diff --git a/test/components/DonationForm/Forms/AddressTypeButtonForm.spec.ts b/test/components/DonationForm/Forms/AddressTypeButtonForm.spec.ts
index 0c3fbfff4..a4cc0b0d2 100644
--- a/test/components/DonationForm/Forms/AddressTypeButtonForm.spec.ts
+++ b/test/components/DonationForm/Forms/AddressTypeButtonForm.spec.ts
@@ -1,14 +1,14 @@
-import { beforeEach, describe, expect, it } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, expect, it } from 'vitest';
+import { nextTick } from 'vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import AddressTypeButtonForm from '@src/components/DonationForm/Forms/AddressTypeButtonForm.vue';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { resetFormModel } from '@test/resetFormModel';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { nextTick } from 'vue';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { TrackerSpy } from '@test/fixtures/TrackerSpy';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/Forms/AddressTypeForm.spec.ts b/test/components/DonationForm/Forms/AddressTypeForm.spec.ts
index a1947d6e0..7809379cd 100644
--- a/test/components/DonationForm/Forms/AddressTypeForm.spec.ts
+++ b/test/components/DonationForm/Forms/AddressTypeForm.spec.ts
@@ -1,16 +1,16 @@
-import { beforeEach, describe, expect, it, test } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, expect, it, test } from 'vitest';
+import { nextTick } from 'vue';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import AddressTypeForm from '@src/components/DonationForm/Forms/AddressTypeForm.vue';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
 import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { resetFormModel } from '@test/resetFormModel';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { nextTick } from 'vue';
 import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 import { Validity } from '@src/utils/FormModel/Validity';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
 import { TrackerSpy } from '@test/fixtures/TrackerSpy';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/Forms/CustomAmountForm.spec.ts b/test/components/DonationForm/Forms/CustomAmountForm.spec.ts
index ec475c82b..adb505524 100644
--- a/test/components/DonationForm/Forms/CustomAmountForm.spec.ts
+++ b/test/components/DonationForm/Forms/CustomAmountForm.spec.ts
@@ -1,12 +1,12 @@
-import { beforeEach, describe, expect, it, test } from 'vitest';
 import { shallowMount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, expect, it, test } from 'vitest';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import CustomAmountForm from '@src/components/DonationForm/Forms/CustomAmountForm.vue';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { TrackerSpy } from '@test/fixtures/TrackerSpy';
 import { resetFormModel } from '@test/resetFormModel';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/Forms/MainDonationForm.spec.ts b/test/components/DonationForm/Forms/MainDonationForm.spec.ts
index 233868fcc..5480411cf 100644
--- a/test/components/DonationForm/Forms/MainDonationForm.spec.ts
+++ b/test/components/DonationForm/Forms/MainDonationForm.spec.ts
@@ -1,15 +1,15 @@
-import { describe, expect, it, vi, beforeEach } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import DonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { newDonationFormValidator } from '@src/validation/DonationFormValidator';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { TrackerSpy } from '@test/fixtures/TrackerSpy';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formItems: DonationFormItems = {
 	addressType: [ AddressTypes.ANONYMOUS, AddressTypes.EMAIL ],
diff --git a/test/components/DonationForm/Forms/MainDonationFormButtonMultiStep.spec.ts b/test/components/DonationForm/Forms/MainDonationFormButtonMultiStep.spec.ts
index 796453e01..69757b3c9 100644
--- a/test/components/DonationForm/Forms/MainDonationFormButtonMultiStep.spec.ts
+++ b/test/components/DonationForm/Forms/MainDonationFormButtonMultiStep.spec.ts
@@ -1,6 +1,6 @@
+import { shallowMount } from '@vue/test-utils';
 import { describe, expect, test } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { shallowMount } from '@vue/test-utils';
 import MainDonationFormButtonMultiStep from '@src/components/DonationForm/Forms/MainDonationFormButtonMultiStep.vue';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
diff --git a/test/components/DonationForm/Forms/MainDonationFormButtonMultiStepAmount.spec.ts b/test/components/DonationForm/Forms/MainDonationFormButtonMultiStepAmount.spec.ts
index 799a7fed0..4a8cff87f 100644
--- a/test/components/DonationForm/Forms/MainDonationFormButtonMultiStepAmount.spec.ts
+++ b/test/components/DonationForm/Forms/MainDonationFormButtonMultiStepAmount.spec.ts
@@ -1,6 +1,6 @@
+import { shallowMount } from '@vue/test-utils';
 import { describe, expect, test } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { shallowMount } from '@vue/test-utils';
 import MainDonationFormButtonMultiStepAmount
 	from '@src/components/DonationForm/Forms/MainDonationFormButtonMultiStepAmount.vue';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
diff --git a/test/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.spec.ts b/test/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.spec.ts
index b6a70b4c8..f2ad731d8 100644
--- a/test/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.spec.ts
+++ b/test/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.spec.ts
@@ -1,9 +1,9 @@
+import { shallowMount } from '@vue/test-utils';
 import { describe, expect, test } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { shallowMount } from '@vue/test-utils';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import MainDonationFormPaymentMethodLabeledButton
 	from '@src/components/DonationForm/Forms/MainDonationFormPaymentMethodLabeledButton.vue';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 const translate = ( key: string ): string => key;
 
diff --git a/test/components/DonationForm/Forms/UpgradeToMonthlyForm.spec.ts b/test/components/DonationForm/Forms/UpgradeToMonthlyForm.spec.ts
index 5b74ebbcf..2289c6c67 100644
--- a/test/components/DonationForm/Forms/UpgradeToMonthlyForm.spec.ts
+++ b/test/components/DonationForm/Forms/UpgradeToMonthlyForm.spec.ts
@@ -1,13 +1,13 @@
-import { beforeEach, describe, expect, it } from 'vitest';
 import { shallowMount, VueWrapper } from '@vue/test-utils';
-import UpgradeToMonthlyForm from '@src/components/DonationForm/Forms/UpgradeToMonthlyForm.vue';
+import { beforeEach, describe, expect, it } from 'vitest';
+import { nextTick } from 'vue';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
+import UpgradeToMonthlyForm from '@src/components/DonationForm/Forms/UpgradeToMonthlyForm.vue';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { UpgradeToMonthlyEvent } from '@src/tracking/events/UpgradeToMonthlyEvent';
 import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { TrackerSpy } from '@test/fixtures/TrackerSpy';
-import { UpgradeToMonthlyEvent } from '@src/tracking/events/UpgradeToMonthlyEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
-import { nextTick } from 'vue';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/Forms/UpgradeToYearlyButtonForm.spec.ts b/test/components/DonationForm/Forms/UpgradeToYearlyButtonForm.spec.ts
index 7732031e4..f9b60c011 100644
--- a/test/components/DonationForm/Forms/UpgradeToYearlyButtonForm.spec.ts
+++ b/test/components/DonationForm/Forms/UpgradeToYearlyButtonForm.spec.ts
@@ -1,13 +1,13 @@
-import { beforeEach, describe, expect, it } from 'vitest';
 import { shallowMount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, expect, it } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
-import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { UpgradeToYearlyEvent } from '@src/tracking/events/UpgradeToYearlyEvent';
+import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { TrackerSpy } from '@test/fixtures/TrackerSpy';
-import { UpgradeToYearlyEvent } from '@src/tracking/events/UpgradeToYearlyEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/Forms/UpgradeToYearlyForm.spec.ts b/test/components/DonationForm/Forms/UpgradeToYearlyForm.spec.ts
index e281cade3..30384e47f 100644
--- a/test/components/DonationForm/Forms/UpgradeToYearlyForm.spec.ts
+++ b/test/components/DonationForm/Forms/UpgradeToYearlyForm.spec.ts
@@ -1,12 +1,12 @@
-import { beforeEach, describe, expect, it } from 'vitest';
 import { shallowMount, VueWrapper } from '@vue/test-utils';
-import UpgradeToYearlyForm from '@src/components/DonationForm/Forms/UpgradeToYearlyForm.vue';
+import { beforeEach, describe, expect, it } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
+import UpgradeToYearlyForm from '@src/components/DonationForm/Forms/UpgradeToYearlyForm.vue';
+import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { UpgradeToYearlyEvent } from '@src/tracking/events/UpgradeToYearlyEvent';
 import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
 import { TrackerSpy } from '@test/fixtures/TrackerSpy';
-import { UpgradeToYearlyEvent } from '@src/tracking/events/UpgradeToYearlyEvent';
-import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/MultiStepDonation.spec.ts b/test/components/DonationForm/MultiStepDonation.spec.ts
index e54e45231..8ebf25a37 100644
--- a/test/components/DonationForm/MultiStepDonation.spec.ts
+++ b/test/components/DonationForm/MultiStepDonation.spec.ts
@@ -1,12 +1,12 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
-import SubFormStub from '@test/fixtures/SubFormStub.vue';
 import { StepController } from '@src/components/DonationForm/StepController';
 import { PageScroller } from '@src/utils/PageScroller/PageScroller';
 import { StepControllerSpy } from '@test/fixtures/StepControllerSpy';
-import { TrackerSpy } from '@test/fixtures/TrackerSpy';
+import SubFormStub from '@test/fixtures/SubFormStub.vue';
 import { TimerStub } from '@test/fixtures/TimerStub';
+import { TrackerSpy } from '@test/fixtures/TrackerSpy';
 
 const subFormEmitterTemplate = `<template #form-page-1="{ pageIndex, submit, previous }">
 	<button
diff --git a/test/components/DonationForm/StepControllers/IntermediateCustomAmount.spec.ts b/test/components/DonationForm/StepControllers/IntermediateCustomAmount.spec.ts
index 33b68f4fa..74b2ca8c6 100644
--- a/test/components/DonationForm/StepControllers/IntermediateCustomAmount.spec.ts
+++ b/test/components/DonationForm/StepControllers/IntermediateCustomAmount.spec.ts
@@ -1,9 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { createIntermediateCustomAmount } from '@src/components/DonationForm/StepControllers/IntermediateCustomAmount';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { resetFormModel } from '@test/resetFormModel';
+import { createIntermediateCustomAmount } from '@src/components/DonationForm/StepControllers/IntermediateCustomAmount';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/IntermediateMainDonationForm.spec.ts b/test/components/DonationForm/StepControllers/IntermediateMainDonationForm.spec.ts
index f520931dc..87a4a3eee 100644
--- a/test/components/DonationForm/StepControllers/IntermediateMainDonationForm.spec.ts
+++ b/test/components/DonationForm/StepControllers/IntermediateMainDonationForm.spec.ts
@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, it, test, vi } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { resetFormModel } from '@test/resetFormModel';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import {
 	createIntermediateMainDonationForm
 } from '@src/components/DonationForm/StepControllers/IntermediateMainDonationForm';
+import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/IntermediateUpgradeToYearly.spec.ts b/test/components/DonationForm/StepControllers/IntermediateUpgradeToYearly.spec.ts
index 15d534b4e..934bc58df 100644
--- a/test/components/DonationForm/StepControllers/IntermediateUpgradeToYearly.spec.ts
+++ b/test/components/DonationForm/StepControllers/IntermediateUpgradeToYearly.spec.ts
@@ -1,11 +1,11 @@
-import { beforeEach, describe, vi, it, expect } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { resetFormModel } from '@test/resetFormModel';
 import {
 	createIntermediateUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/IntermediateUpgradeToYearly';
+import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/SubmittableAddressType.spec.ts b/test/components/DonationForm/StepControllers/SubmittableAddressType.spec.ts
index 20ec177f0..61721496b 100644
--- a/test/components/DonationForm/StepControllers/SubmittableAddressType.spec.ts
+++ b/test/components/DonationForm/StepControllers/SubmittableAddressType.spec.ts
@@ -1,10 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { createSubmittableAddressType } from '@src/components/DonationForm/StepControllers/SubmittableAddressType';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import { createSubmittableAddressType } from '@src/components/DonationForm/StepControllers/SubmittableAddressType';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { resetFormModel } from '@test/resetFormModel';
 import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { Validity } from '@src/utils/FormModel/Validity';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/SubmittableCustomAmount.spec.ts b/test/components/DonationForm/StepControllers/SubmittableCustomAmount.spec.ts
index 815f28e6a..8b3c842b5 100644
--- a/test/components/DonationForm/StepControllers/SubmittableCustomAmount.spec.ts
+++ b/test/components/DonationForm/StepControllers/SubmittableCustomAmount.spec.ts
@@ -1,9 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { createSubmittableCustomAmount } from '@src/components/DonationForm/StepControllers/SubmittableCustomAmount';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import { createSubmittableCustomAmount } from '@src/components/DonationForm/StepControllers/SubmittableCustomAmount';
 import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { resetFormModel } from '@test/resetFormModel';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/SubmittableMainDonationForm.spec.ts b/test/components/DonationForm/StepControllers/SubmittableMainDonationForm.spec.ts
index 8c683f197..8ab0be02c 100644
--- a/test/components/DonationForm/StepControllers/SubmittableMainDonationForm.spec.ts
+++ b/test/components/DonationForm/StepControllers/SubmittableMainDonationForm.spec.ts
@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, it, test, vi } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { resetFormModel } from '@test/resetFormModel';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import {
 	createSubmittableMainDonationForm
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
+import { StepAction } from '@src/components/DonationForm/StepNavigation';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous.spec.ts b/test/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous.spec.ts
index a9972dca3..5893b19df 100644
--- a/test/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous.spec.ts
+++ b/test/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous.spec.ts
@@ -1,13 +1,12 @@
-import { describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationFormSinglePageAnonymous
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationFormSinglePageAnonymous';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
-import { useFormModel } from '@src/components/composables/useFormModel';
-import { beforeEach } from 'vitest';
-import { resetFormModel } from '@test/resetFormModel';
 import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/SubmittableMainDonationFormUpgradeOptions.spec.ts b/test/components/DonationForm/StepControllers/SubmittableMainDonationFormUpgradeOptions.spec.ts
index e429c00af..136c8a4fa 100644
--- a/test/components/DonationForm/StepControllers/SubmittableMainDonationFormUpgradeOptions.spec.ts
+++ b/test/components/DonationForm/StepControllers/SubmittableMainDonationFormUpgradeOptions.spec.ts
@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, it, test, vi } from 'vitest';
-import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { resetFormModel } from '@test/resetFormModel';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { useFormModel } from '@src/components/composables/useFormModel';
 import {
 	createSubmittableMainDonationFormUpgradeOptions
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationFormUpgradeOptions';
-import { useFormModel } from '@src/components/composables/useFormModel';
+import { StepAction } from '@src/components/DonationForm/StepNavigation';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/SubmittableMainDonationFormWhenOverAmount.spec.ts b/test/components/DonationForm/StepControllers/SubmittableMainDonationFormWhenOverAmount.spec.ts
index 24c70696d..b394c887b 100644
--- a/test/components/DonationForm/StepControllers/SubmittableMainDonationFormWhenOverAmount.spec.ts
+++ b/test/components/DonationForm/StepControllers/SubmittableMainDonationFormWhenOverAmount.spec.ts
@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, it, test, vi } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { resetFormModel } from '@test/resetFormModel';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import {
 	createSubmittableMainDonationFormWhenOverAmount
 } from '@src/components/DonationForm/StepControllers/SubmittableMainDonationFormWhenOverAmount';
+import { StepAction } from '@src/components/DonationForm/StepNavigation';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/SubmittableUpgradeToMonthly.spec.ts b/test/components/DonationForm/StepControllers/SubmittableUpgradeToMonthly.spec.ts
index 04362ef94..66b474a64 100644
--- a/test/components/DonationForm/StepControllers/SubmittableUpgradeToMonthly.spec.ts
+++ b/test/components/DonationForm/StepControllers/SubmittableUpgradeToMonthly.spec.ts
@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { resetFormModel } from '@test/resetFormModel';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
 import {
 	createSubmittableUpgradeToMonthly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToMonthly';
+import { StepAction } from '@src/components/DonationForm/StepNavigation';
+import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/StepControllers/SubmittableUpgradeToYearly.spec.ts b/test/components/DonationForm/StepControllers/SubmittableUpgradeToYearly.spec.ts
index b48bb367d..ad0d6a761 100644
--- a/test/components/DonationForm/StepControllers/SubmittableUpgradeToYearly.spec.ts
+++ b/test/components/DonationForm/StepControllers/SubmittableUpgradeToYearly.spec.ts
@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { useFormModel } from '@src/components/composables/useFormModel';
-import { StepAction } from '@src/components/DonationForm/StepNavigation';
-import { resetFormModel } from '@test/resetFormModel';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import {
 	createSubmittableUpgradeToYearly
 } from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
+import { StepAction } from '@src/components/DonationForm/StepNavigation';
 import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 
diff --git a/test/components/DonationForm/SubComponents/SelectCustomAmount.spec.ts b/test/components/DonationForm/SubComponents/SelectCustomAmount.spec.ts
index 345b484dc..5cfaf4f08 100644
--- a/test/components/DonationForm/SubComponents/SelectCustomAmount.spec.ts
+++ b/test/components/DonationForm/SubComponents/SelectCustomAmount.spec.ts
@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, it } from 'vitest';
 import { shallowMount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, expect, it } from 'vitest';
 import SelectCustomAmount from '@src/components/DonationForm/SubComponents/SelectCustomAmount.vue';
 
 describe( 'SelectCustomAmount.vue', () => {
diff --git a/test/components/DonationForm/SubComponents/SelectGroup.spec.ts b/test/components/DonationForm/SubComponents/SelectGroup.spec.ts
index b4399bd95..4545a358d 100644
--- a/test/components/DonationForm/SubComponents/SelectGroup.spec.ts
+++ b/test/components/DonationForm/SubComponents/SelectGroup.spec.ts
@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, it } from 'vitest';
 import { shallowMount, VueWrapper } from '@vue/test-utils';
+import { beforeEach, describe, expect, it } from 'vitest';
 import SelectGroup from '@src/components/DonationForm/SubComponents/SelectGroup.vue';
 
 describe( 'SelectGroup.vue', () => {
diff --git a/test/components/FallbackBanner/FallbackButton.spec.ts b/test/components/FallbackBanner/FallbackButton.spec.ts
index ac08cd9d6..18016dd02 100644
--- a/test/components/FallbackBanner/FallbackButton.spec.ts
+++ b/test/components/FallbackBanner/FallbackButton.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { shallowMount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import FallbackButton from '@src/components/FallbackBanner/FallbackButton.vue';
 
 describe( 'FallbackButton.vue', () => {
diff --git a/test/components/FallbackBanner/LargeFooter.spec.ts b/test/components/FallbackBanner/LargeFooter.spec.ts
index 0597f724a..70d343197 100644
--- a/test/components/FallbackBanner/LargeFooter.spec.ts
+++ b/test/components/FallbackBanner/LargeFooter.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { mount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import LargeFooter from '@src/components/FallbackBanner/LargeFooter.vue';
 
 describe( 'LargeFooter.vue', () => {
diff --git a/test/components/FallbackBanner/SmallFooter.spec.ts b/test/components/FallbackBanner/SmallFooter.spec.ts
index d6e5a6aa8..9f4de1d50 100644
--- a/test/components/FallbackBanner/SmallFooter.spec.ts
+++ b/test/components/FallbackBanner/SmallFooter.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { mount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import SmallFooter from '@src/components/FallbackBanner/SmallFooter.vue';
 
 describe( 'SmallFooter.vue', () => {
diff --git a/test/components/FallbackBanner/UseOfFundsLink.spec.ts b/test/components/FallbackBanner/UseOfFundsLink.spec.ts
index 380ac1bb7..e75d0c5f4 100644
--- a/test/components/FallbackBanner/UseOfFundsLink.spec.ts
+++ b/test/components/FallbackBanner/UseOfFundsLink.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { mount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import UseOfFundsLink from '@src/components/FallbackBanner/UseOfFundsLink.vue';
 
 describe( 'UseOfFundsLink.vue', () => {
diff --git a/test/components/Footer/BannerFooter.spec.ts b/test/components/Footer/BannerFooter.spec.ts
index 695164447..9b0db5711 100644
--- a/test/components/Footer/BannerFooter.spec.ts
+++ b/test/components/Footer/BannerFooter.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { shallowMount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import BannerFooter from '@src/components/Footer/BannerFooter.vue';
 
 describe( 'BannerFooter.vue', () => {
diff --git a/test/components/Footer/FooterAlreadyDonated.spec.ts b/test/components/Footer/FooterAlreadyDonated.spec.ts
index 2514048ca..8350589d6 100644
--- a/test/components/Footer/FooterAlreadyDonated.spec.ts
+++ b/test/components/Footer/FooterAlreadyDonated.spec.ts
@@ -1,8 +1,8 @@
-import { describe, expect, it } from 'vitest';
 import { shallowMount, VueWrapper } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue';
-import { TrackerSpy } from '@test/fixtures/TrackerSpy';
 import { ClickAlreadyDonatedEvent } from '@src/tracking/events/ClickAlreadyDonatedEvent';
+import { TrackerSpy } from '@test/fixtures/TrackerSpy';
 
 describe( 'FooterAlreadyDonated.vue', () => {
 	let tracker: TrackerSpy;
diff --git a/test/components/Footer/SelectionInput.spec.ts b/test/components/Footer/SelectionInput.spec.ts
index 570605dbd..755ed34f2 100644
--- a/test/components/Footer/SelectionInput.spec.ts
+++ b/test/components/Footer/SelectionInput.spec.ts
@@ -1,5 +1,5 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { shallowMount, VueWrapper } from '@vue/test-utils';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import SelectionInput from '@src/components/Footer/SelectionInput.vue';
 import { TimerStub } from '@test/fixtures/TimerStub';
 
diff --git a/test/components/Footer/SmallPrintFooter.spec.ts b/test/components/Footer/SmallPrintFooter.spec.ts
index bb843bf90..9dbbdf7c1 100644
--- a/test/components/Footer/SmallPrintFooter.spec.ts
+++ b/test/components/Footer/SmallPrintFooter.spec.ts
@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest';
 import { shallowMount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import SmallPrintFooter from '@src/components/Footer/SmallPrintFooter.vue';
 
 describe( 'SmallPrintFooter.vue', () => {
diff --git a/test/components/ProgressBar/DoubleProgressBar.spec.ts b/test/components/ProgressBar/DoubleProgressBar.spec.ts
index e07a40619..cd2329e37 100644
--- a/test/components/ProgressBar/DoubleProgressBar.spec.ts
+++ b/test/components/ProgressBar/DoubleProgressBar.spec.ts
@@ -1,8 +1,8 @@
 import { mount } from '@vue/test-utils';
-import { describe, it, expect, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it } from 'vitest';
 import ProgressBar from '@src/components/ProgressBar/DoubleProgressBar.vue';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { DateAndTime } from '@src/utils/DynamicContent/DateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 describe( 'DoubleProgressBar.vue', () => {
 	let dynamicCampaignContent: DynamicContent;
diff --git a/test/components/ProgressBar/ProgressBar.spec.ts b/test/components/ProgressBar/ProgressBar.spec.ts
index 33b69284e..dd5b45d93 100644
--- a/test/components/ProgressBar/ProgressBar.spec.ts
+++ b/test/components/ProgressBar/ProgressBar.spec.ts
@@ -1,8 +1,8 @@
 import { mount } from '@vue/test-utils';
+import { beforeEach, describe, expect, it } from 'vitest';
 import ProgressBar from '@src/components/ProgressBar/ProgressBar.vue';
-import { describe, it, expect, beforeEach } from 'vitest';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { DateAndTime } from '@src/utils/DynamicContent/DateAndTime';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 
 describe( 'ProgressBar.vue', () => {
 	let dynamicCampaignContent: DynamicContent;
diff --git a/test/components/Slider/KeenSlider.spec.ts b/test/components/Slider/KeenSlider.spec.ts
index 199937e9f..2061eee36 100644
--- a/test/components/Slider/KeenSlider.spec.ts
+++ b/test/components/Slider/KeenSlider.spec.ts
@@ -1,10 +1,10 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
-import KeenSlider from '@src/components/Slider/KeenSlider.vue';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { nextTick } from 'vue';
-import { TimerStub } from '@test/fixtures/TimerStub';
+import KeenSlider from '@src/components/Slider/KeenSlider.vue';
 import { Timer } from '@src/utils/Timer';
 import { TimerSpy } from '@test/fixtures/TimerSpy';
+import { TimerStub } from '@test/fixtures/TimerStub';
 
 describe( 'KeenSlider', () => {
 
diff --git a/test/components/SoftClose/SoftClose.spec.ts b/test/components/SoftClose/SoftClose.spec.ts
index 6e9ed4bed..f1f8bc064 100644
--- a/test/components/SoftClose/SoftClose.spec.ts
+++ b/test/components/SoftClose/SoftClose.spec.ts
@@ -1,10 +1,10 @@
-import { describe, expect, it, afterEach, beforeEach, vi } from 'vitest';
 import { mount, VueWrapper } from '@vue/test-utils';
-import SoftClose from '@src/components/SoftClose/SoftClose.vue';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import ButtonClose from '@src/components/ButtonClose/ButtonClose.vue';
-import { TimerStub } from '@test/fixtures/TimerStub';
+import SoftClose from '@src/components/SoftClose/SoftClose.vue';
 import { Timer } from '@src/utils/Timer';
 import { TimerSpy } from '@test/fixtures/TimerSpy';
+import { TimerStub } from '@test/fixtures/TimerStub';
 
 describe( 'SoftClose', function () {
 
diff --git a/test/components/UseOfFunds/CompanyBudgets.spec.ts b/test/components/UseOfFunds/CompanyBudgets.spec.ts
index 073771bc3..645484204 100644
--- a/test/components/UseOfFunds/CompanyBudgets.spec.ts
+++ b/test/components/UseOfFunds/CompanyBudgets.spec.ts
@@ -1,6 +1,6 @@
+import { shallowMount } from '@vue/test-utils';
 import { describe, expect, it } from 'vitest';
 import CompanyBudgets from '@src/components/UseOfFunds/CompanyBudgets.vue';
-import { shallowMount } from '@vue/test-utils';
 import { Company } from '@src/domain/UseOfFunds/Company';
 
 const companies: Company[] = [
diff --git a/test/components/UseOfFunds/FundsContent.spec.ts b/test/components/UseOfFunds/FundsContent.spec.ts
index e9c295fa5..8a98bf233 100644
--- a/test/components/UseOfFunds/FundsContent.spec.ts
+++ b/test/components/UseOfFunds/FundsContent.spec.ts
@@ -1,7 +1,7 @@
-import { describe, expect, it } from 'vitest';
-import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
 import { shallowMount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
 import FundsContent from '@src/components/UseOfFunds/FundsContent.vue';
+import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
 
 describe( 'FundsContent.vue', () => {
 	const getContent = (): UseOfFundsContent => {
diff --git a/test/components/UseOfFunds/FundsDistributionAccordion.spec.ts b/test/components/UseOfFunds/FundsDistributionAccordion.spec.ts
index a6fffd3e1..72b900b2e 100644
--- a/test/components/UseOfFunds/FundsDistributionAccordion.spec.ts
+++ b/test/components/UseOfFunds/FundsDistributionAccordion.spec.ts
@@ -1,6 +1,6 @@
+import { shallowMount } from '@vue/test-utils';
 import { describe, expect, it } from 'vitest';
 import FundsDistributionAccordion from '@src/components/UseOfFunds/FundsDistributionAccordion.vue';
-import { shallowMount } from '@vue/test-utils';
 import { ApplicationOfFundsItem } from '@src/domain/UseOfFunds/ApplicationOfFundsItem';
 
 const applicationOfFundsData: ApplicationOfFundsItem[] = [
diff --git a/test/components/UseOfFunds/FundsModal.spec.ts b/test/components/UseOfFunds/FundsModal.spec.ts
index 80d989849..5847c657e 100644
--- a/test/components/UseOfFunds/FundsModal.spec.ts
+++ b/test/components/UseOfFunds/FundsModal.spec.ts
@@ -1,5 +1,5 @@
+import { mount, shallowMount } from '@vue/test-utils';
 import { describe, expect, it } from 'vitest';
-import { shallowMount, mount } from '@vue/test-utils';
 import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
 import { UseOfFundsContent } from '@src/domain/UseOfFunds/UseOfFundsContent';
 
diff --git a/test/components/composables/useAnonymousAddressTypeSetter.spec.ts b/test/components/composables/useAnonymousAddressTypeSetter.spec.ts
index 87f468610..3919d48b3 100644
--- a/test/components/composables/useAnonymousAddressTypeSetter.spec.ts
+++ b/test/components/composables/useAnonymousAddressTypeSetter.spec.ts
@@ -1,10 +1,10 @@
 import { beforeEach, describe, expect, test } from 'vitest';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
-import { useFormModel } from '@src/components/composables/useFormModel';
 import { nextTick } from 'vue';
-import { resetFormModel } from '@test/resetFormModel';
 import { useAnonymousAddressTypeSetter } from '@src/components/composables/useAnonymousAddressTypeSetter';
+import { useFormModel } from '@src/components/composables/useFormModel';
+import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { resetFormModel } from '@test/resetFormModel';
 
 const formModel = useFormModel();
 describe( 'useAnonymousAddressTypeSetter', () => {
diff --git a/test/components/composables/useDisplaySwitch.spec.ts b/test/components/composables/useDisplaySwitch.spec.ts
index 41f71c31b..696607863 100644
--- a/test/components/composables/useDisplaySwitch.spec.ts
+++ b/test/components/composables/useDisplaySwitch.spec.ts
@@ -1,7 +1,7 @@
+import { shallowMount } from '@vue/test-utils';
 import { describe, expect, it, vi } from 'vitest';
-import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 import { defineComponent } from 'vue';
-import { shallowMount } from '@vue/test-utils';
+import { useDisplaySwitch } from '@src/components/composables/useDisplaySwitch';
 
 describe( 'useDisplaySwitch', () => {
 	const TestComponent = defineComponent( {
diff --git a/test/components/composables/useFormModel.spec.ts b/test/components/composables/useFormModel.spec.ts
index 6c693fdf2..ab4432704 100644
--- a/test/components/composables/useFormModel.spec.ts
+++ b/test/components/composables/useFormModel.spec.ts
@@ -1,11 +1,11 @@
 import { beforeEach, describe, expect, it, test } from 'vitest';
+import { nextTick } from 'vue';
 import { useFormModel } from '@src/components/composables/useFormModel';
 import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { nextTick } from 'vue';
 import { Intervals, RecurringIntervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { Validity } from '@src/utils/FormModel/Validity';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
+import { Validity } from '@src/utils/FormModel/Validity';
 import { resetFormModel } from '@test/resetFormModel';
 
 const model = useFormModel();
diff --git a/test/features/BannerContent.ts b/test/features/BannerContent.ts
index b28e3b26e..b6938c26e 100644
--- a/test/features/BannerContent.ts
+++ b/test/features/BannerContent.ts
@@ -1,9 +1,9 @@
 import { VueWrapper } from '@vue/test-utils';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { expect, vi } from 'vitest';
-import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Timer } from '@src/utils/Timer';
+import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
 import { TimerSpy } from '@test/fixtures/TimerSpy';
 
 const expectSlideShowPlaysWhenBecomesVisible = async ( wrapper: VueWrapper<any> ): Promise<any> => {
diff --git a/test/features/FallbackBanner.ts b/test/features/FallbackBanner.ts
index 9b60246d0..43304ae91 100644
--- a/test/features/FallbackBanner.ts
+++ b/test/features/FallbackBanner.ts
@@ -1,15 +1,15 @@
 import { VueWrapper } from '@vue/test-utils';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { Tracker } from '@src/tracking/Tracker';
 import { expect, vi } from 'vitest';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { CloseChoices } from '@src/domain/CloseChoices';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
-import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
-import { TrackerSpy } from '@test/fixtures/TrackerSpy';
+import { CloseChoices } from '@src/domain/CloseChoices';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent';
+import { Tracker } from '@src/tracking/Tracker';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Timer } from '@src/utils/Timer';
+import { newDynamicContent } from '@test/banners/dynamicCampaignContent';
 import { TimerSpy } from '@test/fixtures/TimerSpy';
+import { TrackerSpy } from '@test/fixtures/TrackerSpy';
 
 const showsTheSmallBanner = async ( getWrapperAtWidth: ( width: number ) => VueWrapper<any> ): Promise<any> => {
 	const wrapper = getWrapperAtWidth( 799 );
diff --git a/test/features/FullPageBanner.ts b/test/features/FullPageBanner.ts
index 1aabbed23..418bd2ecd 100644
--- a/test/features/FullPageBanner.ts
+++ b/test/features/FullPageBanner.ts
@@ -1,7 +1,7 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect } from 'vitest';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 
 const expectEmitsCloseEvent = async ( wrapper: VueWrapper<any> ): Promise<any> => {
 	await wrapper.find( '.wmde-banner-mini-button' ).trigger( 'click' );
diff --git a/test/features/MainBanner.ts b/test/features/MainBanner.ts
index a82288e84..a3ea649f2 100644
--- a/test/features/MainBanner.ts
+++ b/test/features/MainBanner.ts
@@ -1,7 +1,7 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect } from 'vitest';
-import { CloseEvent } from '@src/tracking/events/CloseEvent';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { CloseEvent } from '@src/tracking/events/CloseEvent';
 
 const expectEmitsCloseEvent = async ( wrapper: VueWrapper<any> ): Promise<any> => {
 	await wrapper.find( '.wmde-banner-main .wmde-banner-close' ).trigger( 'click' );
diff --git a/test/features/MiniBanner.ts b/test/features/MiniBanner.ts
index a0df1102b..ce3a18a73 100644
--- a/test/features/MiniBanner.ts
+++ b/test/features/MiniBanner.ts
@@ -1,6 +1,6 @@
 import { VueWrapper } from '@vue/test-utils';
-import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 import { expect } from 'vitest';
+import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
 
 const expectSlideShowPlaysWhenMiniBannerBecomesVisible = async ( wrapper: VueWrapper<any> ): Promise<any> => {
 	await wrapper.setProps( { bannerState: BannerStates.Visible } );
diff --git a/test/features/MiniBannerPreselect.ts b/test/features/MiniBannerPreselect.ts
index 151560229..95863f710 100644
--- a/test/features/MiniBannerPreselect.ts
+++ b/test/features/MiniBannerPreselect.ts
@@ -1,7 +1,7 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect } from 'vitest';
-import { Tracker } from '@src/tracking/Tracker';
 import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
+import { Tracker } from '@src/tracking/Tracker';
 
 const expectShowsFullPageWhenPreselectIsClicked = async ( wrapper: VueWrapper<any> ): Promise<any> => {
 	await wrapper.find( '.wmde-banner-mini-button-preselect' ).trigger( 'click' );
diff --git a/test/features/SetCookieImage.ts b/test/features/SetCookieImage.ts
index cdaf18c6f..ae1a0ba61 100644
--- a/test/features/SetCookieImage.ts
+++ b/test/features/SetCookieImage.ts
@@ -1,8 +1,8 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect } from 'vitest';
-import { TimerSpy } from '@test/fixtures/TimerSpy';
 import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Timer } from '@src/utils/Timer';
+import { TimerSpy } from '@test/fixtures/TimerSpy';
 
 const expectSetsCookieImageOnSoftCloseClose = async ( getWrapper: () => VueWrapper<any> ): Promise<any> => {
 	const wrapper = getWrapper();
diff --git a/test/features/SetCookieImageMobile.ts b/test/features/SetCookieImageMobile.ts
index cd737fa5e..2b16b9cd5 100644
--- a/test/features/SetCookieImageMobile.ts
+++ b/test/features/SetCookieImageMobile.ts
@@ -1,8 +1,8 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect, vi } from 'vitest';
-import { TimerSpy } from '@test/fixtures/TimerSpy';
 import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Timer } from '@src/utils/Timer';
+import { TimerSpy } from '@test/fixtures/TimerSpy';
 
 const expectSetsCookieImageOnSoftCloseClose = async ( getWrapper: () => VueWrapper<any> ): Promise<any> => {
 	const wrapper = getWrapper();
diff --git a/test/features/SoftCloseDesktop.ts b/test/features/SoftCloseDesktop.ts
index 5b4c63500..d4a972599 100644
--- a/test/features/SoftCloseDesktop.ts
+++ b/test/features/SoftCloseDesktop.ts
@@ -1,10 +1,10 @@
-import { expect } from 'vitest';
 import { VueWrapper } from '@vue/test-utils';
+import { expect } from 'vitest';
 import { CloseChoices } from '@src/domain/CloseChoices';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TimerSpy } from '@test/fixtures/TimerSpy';
 import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Timer } from '@src/utils/Timer';
+import { TimerSpy } from '@test/fixtures/TimerSpy';
 
 const expectShowsSoftClose = async ( getWrapper: () => VueWrapper<any> ): Promise<any> => {
 	const wrapper = getWrapper();
diff --git a/test/features/SoftCloseMobile.ts b/test/features/SoftCloseMobile.ts
index 03be8c0f7..fa5756965 100644
--- a/test/features/SoftCloseMobile.ts
+++ b/test/features/SoftCloseMobile.ts
@@ -1,10 +1,10 @@
-import { expect } from 'vitest';
 import { VueWrapper } from '@vue/test-utils';
+import { expect } from 'vitest';
 import { CloseChoices } from '@src/domain/CloseChoices';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { TimerSpy } from '@test/fixtures/TimerSpy';
-import { Timer } from '@src/utils/Timer';
 import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
+import { Timer } from '@src/utils/Timer';
+import { TimerSpy } from '@test/fixtures/TimerSpy';
 
 const expectShowsSoftCloseOnMiniBannerClose = async ( getWrapper: () => VueWrapper<any> ): Promise<any> => {
 	const wrapper = getWrapper();
diff --git a/test/features/SoftCloseSubmitTracking.ts b/test/features/SoftCloseSubmitTracking.ts
index c6ae56853..826b6f911 100644
--- a/test/features/SoftCloseSubmitTracking.ts
+++ b/test/features/SoftCloseSubmitTracking.ts
@@ -1,12 +1,12 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect, vi } from 'vitest';
 import { CloseChoices } from '@src/domain/CloseChoices';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
-import { submitMainDonationForm } from '@test/features/forms/subForms/MainDonationForm';
+import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { Tracker } from '@src/tracking/Tracker';
-import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import { submitMainDonationForm } from '@test/features/forms/subForms/MainDonationForm';
 
 const expectStoresCloseChoiceInBannerWithoutSoftClose = async ( wrapper: VueWrapper<any> ): Promise<any> => {
 	const localCloseTracker: LocalCloseTracker = {
diff --git a/test/features/SoftCloseSubmitTrackingDesktop.ts b/test/features/SoftCloseSubmitTrackingDesktop.ts
index 706a4a997..08e8f5c1c 100644
--- a/test/features/SoftCloseSubmitTrackingDesktop.ts
+++ b/test/features/SoftCloseSubmitTrackingDesktop.ts
@@ -1,12 +1,12 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect, vi } from 'vitest';
 import { CloseChoices } from '@src/domain/CloseChoices';
-import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
-import { submitMainDonationForm } from '@test/features/forms/subForms/MainDonationForm';
+import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { Tracker } from '@src/tracking/Tracker';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { Tracker } from '@src/tracking/Tracker';
-import { BannerSubmitOnReturnEvent } from '@src/tracking/events/BannerSubmitOnReturnEvent';
+import { LocalCloseTracker } from '@src/utils/LocalCloseTracker';
+import { submitMainDonationForm } from '@test/features/forms/subForms/MainDonationForm';
 
 const expectStoresCloseChoiceInBannerWithoutSoftClose = async ( wrapper: VueWrapper<any> ): Promise<any> => {
 	const localCloseTracker: LocalCloseTracker = {
diff --git a/test/features/form_action_switch/MainDonation_UpgradeToYearly.ts b/test/features/form_action_switch/MainDonation_UpgradeToYearly.ts
index 971c01cfe..df479c191 100644
--- a/test/features/form_action_switch/MainDonation_UpgradeToYearly.ts
+++ b/test/features/form_action_switch/MainDonation_UpgradeToYearly.ts
@@ -1,7 +1,7 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect, vi } from 'vitest';
-import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 
 const goToUpgradeStep = async ( wrapper: VueWrapper<any>, payment: FormItem ): Promise<any> => {
 	await wrapper.find( `.interval-0 .wmde-banner-select-group-input` ).setValue();
diff --git a/test/features/form_action_switch/MainDonation_UpgradeToYearlyButton.ts b/test/features/form_action_switch/MainDonation_UpgradeToYearlyButton.ts
index 9c88c2b80..c841c95b0 100644
--- a/test/features/form_action_switch/MainDonation_UpgradeToYearlyButton.ts
+++ b/test/features/form_action_switch/MainDonation_UpgradeToYearlyButton.ts
@@ -1,7 +1,7 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect, vi } from 'vitest';
-import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 
 const goToUpgradeStep = async ( wrapper: VueWrapper<any>, payment: FormItem ): Promise<any> => {
 	await wrapper.find( `.interval-0 .wmde-banner-select-group-input` ).setValue();
diff --git a/test/features/forms/MainDonation_TransactionFee.ts b/test/features/forms/MainDonation_TransactionFee.ts
index f3d987f12..48602fd4c 100644
--- a/test/features/forms/MainDonation_TransactionFee.ts
+++ b/test/features/forms/MainDonation_TransactionFee.ts
@@ -1,9 +1,9 @@
 import { VueWrapper } from '@vue/test-utils';
 import { expect } from 'vitest';
 
-import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 
 const setMainDonationFormValues = async ( wrapper: VueWrapper<any>, interval: FormItem, amount: string, payment: FormItem ): Promise<void> => {
 	await wrapper.find( `.${interval.className} .wmde-banner-select-group-input` ).setValue();
diff --git a/test/features/forms/MainDonation_UpgradeToMonthlyOrYearly.ts b/test/features/forms/MainDonation_UpgradeToMonthlyOrYearly.ts
index 755d91d29..5137f9ed4 100644
--- a/test/features/forms/MainDonation_UpgradeToMonthlyOrYearly.ts
+++ b/test/features/forms/MainDonation_UpgradeToMonthlyOrYearly.ts
@@ -1,19 +1,19 @@
 import { VueWrapper } from '@vue/test-utils';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import {
 	expectMainDonationFormGoesToPageOnSubmit,
 	expectMainDonationFormSubmits,
 	submitMainDonationForm
 } from '@test/features/forms/subForms/MainDonationForm';
-import {
-	expectUpgradeToYearlyFormGoesToPageOnLinkClick,
-	expectUpgradeToYearlyFormSubmits
-} from '@test/features/forms/subForms/UpgradeToYearlyForm';
 import {
 	expectUpgradeToMonthlyFormGoesToPageOnLinkClick,
 	expectUpgradeToMonthlyFormSubmits
 } from '@test/features/forms/subForms/UpgradeToMonthlyForm';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import {
+	expectUpgradeToYearlyFormGoesToPageOnLinkClick,
+	expectUpgradeToYearlyFormSubmits
+} from '@test/features/forms/subForms/UpgradeToYearlyForm';
 
 enum Pages {
 	MainDonation = 1,
diff --git a/test/features/forms/MainDonation_UpgradeToYearlyButton.ts b/test/features/forms/MainDonation_UpgradeToYearlyButton.ts
index c42b389db..ea02d29ae 100644
--- a/test/features/forms/MainDonation_UpgradeToYearlyButton.ts
+++ b/test/features/forms/MainDonation_UpgradeToYearlyButton.ts
@@ -1,4 +1,6 @@
 import { VueWrapper } from '@vue/test-utils';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import {
 	expectMainDonationFormGoesToPageOnSubmit,
 	expectMainDonationFormSubmits,
@@ -8,8 +10,6 @@ import {
 	expectUpgradeToYearlyFormGoesToPageOnLinkClick,
 	expectUpgradeToYearlyFormSubmits
 } from '@test/features/forms/subForms/UpgradeToYearlyButtonForm';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 enum Pages {
 	MainDonation = 1,
diff --git a/test/features/forms/MainDonation_UpgradeToYearlyButton_AddressTypeButton.ts b/test/features/forms/MainDonation_UpgradeToYearlyButton_AddressTypeButton.ts
index 96d6269aa..baf868b7f 100644
--- a/test/features/forms/MainDonation_UpgradeToYearlyButton_AddressTypeButton.ts
+++ b/test/features/forms/MainDonation_UpgradeToYearlyButton_AddressTypeButton.ts
@@ -1,4 +1,8 @@
 import { VueWrapper } from '@vue/test-utils';
+import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { expectAddressTypeFormSubmits } from '@test/features/forms/subForms/AddressTypeButtonForm';
 import {
 	expectMainDonationFormGoesToPageOnSubmit,
 	submitMainDonationForm
@@ -7,10 +11,6 @@ import {
 	expectUpgradeToYearlyFormGoesToPageOnLinkClick,
 	expectUpgradeToYearlyFormGoesToPageOnSubmit
 } from '@test/features/forms/subForms/UpgradeToYearlyButtonForm';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { expectAddressTypeFormSubmits } from '@test/features/forms/subForms/AddressTypeButtonForm';
-import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 
 enum Pages {
 	MainDonation = 1,
diff --git a/test/features/forms/MainDonation_UpgradeToYearlyButton_CustomAmount.ts b/test/features/forms/MainDonation_UpgradeToYearlyButton_CustomAmount.ts
index cad8af075..fb4b8a51a 100644
--- a/test/features/forms/MainDonation_UpgradeToYearlyButton_CustomAmount.ts
+++ b/test/features/forms/MainDonation_UpgradeToYearlyButton_CustomAmount.ts
@@ -1,4 +1,7 @@
 import { VueWrapper } from '@vue/test-utils';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { expectCustomAmountFormSubmits } from '@test/features/forms/subForms/CustomAmountForm';
 import {
 	expectMainDonationFormGoesToPageOnSubmit,
 	expectMainDonationFormSubmits,
@@ -8,9 +11,6 @@ import {
 	expectUpgradeToYearlyFormGoesToPageOnLinkClick,
 	expectUpgradeToYearlyFormSubmits
 } from '@test/features/forms/subForms/UpgradeToYearlyButtonForm';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { expectCustomAmountFormSubmits } from '@test/features/forms/subForms/CustomAmountForm';
 
 enum Pages {
 	UpgradeToYearly = 2,
diff --git a/test/features/forms/MainDonation_UpgradeToYearlyLink.ts b/test/features/forms/MainDonation_UpgradeToYearlyLink.ts
index 51ac35cd0..7eb1b816b 100644
--- a/test/features/forms/MainDonation_UpgradeToYearlyLink.ts
+++ b/test/features/forms/MainDonation_UpgradeToYearlyLink.ts
@@ -1,4 +1,6 @@
 import { VueWrapper } from '@vue/test-utils';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 import {
 	expectMainDonationFormGoesToPageOnSubmit,
 	expectMainDonationFormSubmits,
@@ -8,8 +10,6 @@ import {
 	expectUpgradeToYearlyFormGoesToPageOnLinkClick,
 	expectUpgradeToYearlyFormSubmits
 } from '@test/features/forms/subForms/UpgradeToYearlyForm';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
 
 enum Pages {
 	MainDonation = 1,
diff --git a/test/features/forms/MainDonation_UpgradeToYearly_CustomAmount.ts b/test/features/forms/MainDonation_UpgradeToYearly_CustomAmount.ts
index 8939d60b1..187d01d7b 100644
--- a/test/features/forms/MainDonation_UpgradeToYearly_CustomAmount.ts
+++ b/test/features/forms/MainDonation_UpgradeToYearly_CustomAmount.ts
@@ -1,4 +1,7 @@
 import { VueWrapper } from '@vue/test-utils';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { expectCustomAmountFormSubmits } from '@test/features/forms/subForms/CustomAmountForm';
 import {
 	expectMainDonationFormGoesToPageOnSubmit,
 	expectMainDonationFormSubmits,
@@ -8,9 +11,6 @@ import {
 	expectUpgradeToYearlyFormGoesToPageOnLinkClick,
 	expectUpgradeToYearlyFormSubmits
 } from '@test/features/forms/subForms/UpgradeToYearlyForm';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { expectCustomAmountFormSubmits } from '@test/features/forms/subForms/CustomAmountForm';
 
 enum Pages {
 	UpgradeToYearly = 2,
diff --git a/test/features/forms/MainDonation_UpgradeToYearly_CustomAmount_AddressType.ts b/test/features/forms/MainDonation_UpgradeToYearly_CustomAmount_AddressType.ts
index dc7bbf865..943efa235 100644
--- a/test/features/forms/MainDonation_UpgradeToYearly_CustomAmount_AddressType.ts
+++ b/test/features/forms/MainDonation_UpgradeToYearly_CustomAmount_AddressType.ts
@@ -1,4 +1,9 @@
 import { VueWrapper } from '@vue/test-utils';
+import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
+import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
+import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
+import { expectAddressTypeFormSubmits } from '@test/features/forms/subForms/AddressTypeForm';
+import { expectCustomAmountFormGoesToPageOnSubmit } from '@test/features/forms/subForms/CustomAmountForm';
 import {
 	expectMainDonationFormGoesToPageOnSubmit,
 	submitMainDonationForm
@@ -7,11 +12,6 @@ import {
 	expectUpgradeToYearlyFormGoesToPageOnLinkClick,
 	expectUpgradeToYearlyFormGoesToPageOnSubmit
 } from '@test/features/forms/subForms/UpgradeToYearlyForm';
-import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
-import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { expectCustomAmountFormGoesToPageOnSubmit } from '@test/features/forms/subForms/CustomAmountForm';
-import { expectAddressTypeFormSubmits } from '@test/features/forms/subForms/AddressTypeForm';
-import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 
 enum Pages {
 	UpgradeToYearly = 2,
diff --git a/test/features/forms/subForms/AddressTypeButtonForm.ts b/test/features/forms/subForms/AddressTypeButtonForm.ts
index 68c03ac3c..16018579b 100644
--- a/test/features/forms/subForms/AddressTypeButtonForm.ts
+++ b/test/features/forms/subForms/AddressTypeButtonForm.ts
@@ -1,5 +1,5 @@
-import { expect, vi } from 'vitest';
 import { VueWrapper } from '@vue/test-utils';
+import { expect, vi } from 'vitest';
 import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 
 export const submitAddressTypeButtonForm = async ( wrapper: VueWrapper<any>, addressType: FormItem ): Promise<void> => {
diff --git a/test/features/forms/subForms/AddressTypeForm.ts b/test/features/forms/subForms/AddressTypeForm.ts
index 634d62557..c8107f9f8 100644
--- a/test/features/forms/subForms/AddressTypeForm.ts
+++ b/test/features/forms/subForms/AddressTypeForm.ts
@@ -1,5 +1,5 @@
-import { expect, vi } from 'vitest';
 import { VueWrapper } from '@vue/test-utils';
+import { expect, vi } from 'vitest';
 import { FormItem } from '@src/utils/FormItemsBuilder/FormItem';
 
 export const submitAddressTypeForm = async ( wrapper: VueWrapper<any>, addressType: FormItem ): Promise<void> => {
diff --git a/test/fixtures/BannerStateMachineSpy.ts b/test/fixtures/BannerStateMachineSpy.ts
index c8fc2c13a..5a4c973b0 100644
--- a/test/fixtures/BannerStateMachineSpy.ts
+++ b/test/fixtures/BannerStateMachineSpy.ts
@@ -1,6 +1,6 @@
 import { BannerStateMachine } from '@src/components/BannerConductor/StateMachine/BannerStateMachine';
-import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
+import { BannerState } from '@src/components/BannerConductor/StateMachine/states/BannerState';
 
 export class BannerStateMachineSpy extends BannerStateMachine {
 	public statesCalled: BannerStates[] = [];
diff --git a/test/fixtures/PageStub.ts b/test/fixtures/PageStub.ts
index bc850f6e9..8724017c6 100644
--- a/test/fixtures/PageStub.ts
+++ b/test/fixtures/PageStub.ts
@@ -1,7 +1,7 @@
-import { Page } from '@src/page/Page';
-import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
 import { CampaignParameters } from '@src/domain/CampaignParameters';
 import { TrackingParameters } from '@src/domain/TrackingParameters';
+import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { Page } from '@src/page/Page';
 
 export class PageStub implements Page {
 	public hideBannerCallback: () => void;
diff --git a/test/fixtures/TimerSpy.ts b/test/fixtures/TimerSpy.ts
index 1a8bb858b..07003ed8b 100644
--- a/test/fixtures/TimerSpy.ts
+++ b/test/fixtures/TimerSpy.ts
@@ -1,5 +1,5 @@
-import { Timer } from '@src/utils/Timer';
 import { nextTick } from 'vue';
+import { Timer } from '@src/utils/Timer';
 
 export class TimerSpy implements Timer {
 	public clearAllCalls: number = 0;
diff --git a/test/integration/page/PageWPORG.spec.ts b/test/integration/page/PageWPORG.spec.ts
index 8891d5454..644037f1c 100644
--- a/test/integration/page/PageWPORG.spec.ts
+++ b/test/integration/page/PageWPORG.spec.ts
@@ -1,13 +1,13 @@
-import { beforeEach, describe, expect, it, vi, vitest } from 'vitest';
-import PageWPORG, { bannerAppId } from '@src/page/PageWPORG';
-import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
-import { SkinStub } from '@test/fixtures/SkinStub';
-import { SizeIssueCheckerStub } from '@test/fixtures/SizeIssueCheckerStub';
-import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
-import { Vector2 } from '@src/utils/Vector2';
 import { JSDOM } from 'jsdom';
+import { beforeEach, describe, expect, it, vi, vitest } from 'vitest';
 import { CloseChoices } from '@src/domain/CloseChoices';
+import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { MediaWiki } from '@src/page/MediaWiki/MediaWiki';
+import PageWPORG, { bannerAppId } from '@src/page/PageWPORG';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
+import { Vector2 } from '@src/utils/Vector2';
+import { SizeIssueCheckerStub } from '@test/fixtures/SizeIssueCheckerStub';
+import { SkinStub } from '@test/fixtures/SkinStub';
 
 describe( 'PageWPORG', function () {
 	let mediaWiki: MediaWiki;
diff --git a/test/integration/tracking/LegacyTrackerWPORG.spec.ts b/test/integration/tracking/LegacyTrackerWPORG.spec.ts
index ea3a48bcb..36f468375 100644
--- a/test/integration/tracking/LegacyTrackerWPORG.spec.ts
+++ b/test/integration/tracking/LegacyTrackerWPORG.spec.ts
@@ -1,8 +1,8 @@
-import { describe, expect, it, vi, test } from 'vitest';
+import { describe, expect, it, test, vi } from 'vitest';
+import { ClickAlreadyDonatedEvent } from '@src/tracking/events/ClickAlreadyDonatedEvent';
 import { LegacyTrackerWPORG, TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG';
-import { MediaWikiStub } from '@test/fixtures/MediaWikiStub';
 import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
-import { ClickAlreadyDonatedEvent } from '@src/tracking/events/ClickAlreadyDonatedEvent';
+import { MediaWikiStub } from '@test/fixtures/MediaWikiStub';
 
 describe( 'LegacyTrackerWPORG', function () {
 
diff --git a/test/integration/tracking/TrackerWPDE.spec.ts b/test/integration/tracking/TrackerWPDE.spec.ts
index ab5335e11..919a47d46 100644
--- a/test/integration/tracking/TrackerWPDE.spec.ts
+++ b/test/integration/tracking/TrackerWPDE.spec.ts
@@ -1,11 +1,11 @@
-import { describe, beforeEach, it, expect, vi, test, afterEach } from 'vitest';
-import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
-import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
-import { TrackingEvent } from '@src/tracking/TrackingEvent';
+import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
 import { ClickAlreadyDonatedEvent } from '@src/tracking/events/ClickAlreadyDonatedEvent';
 import { CloseEvent } from '@src/tracking/events/CloseEvent';
-import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent';
 import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent';
+import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { TrackerWPDE } from '@src/tracking/TrackerWPDE';
+import { TrackingEvent } from '@src/tracking/TrackingEvent';
 
 interface Window {
 	[ key: string ]: any;
diff --git a/test/integration/utils/Tracking/LegacyEventTracking/mapShownEvent.spec.ts b/test/integration/utils/Tracking/LegacyEventTracking/mapShownEvent.spec.ts
index 2ddc647a9..12a57c168 100644
--- a/test/integration/utils/Tracking/LegacyEventTracking/mapShownEvent.spec.ts
+++ b/test/integration/utils/Tracking/LegacyEventTracking/mapShownEvent.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
 
-import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
 import { ShownEvent } from '@src/tracking/events/ShownEvent';
+import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
 import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
diff --git a/test/resetFormModel.ts b/test/resetFormModel.ts
index 9eddcda68..a6ac886d8 100644
--- a/test/resetFormModel.ts
+++ b/test/resetFormModel.ts
@@ -1,6 +1,6 @@
+import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
 import { FormModel } from '@src/utils/FormModel/FormModel';
 import { Validity } from '@src/utils/FormModel/Validity';
-import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
 
 export function resetFormModel( formModel: FormModel ): void {
 	formModel.interval.value = '';
diff --git a/test/unit/createDonationURL.spec.ts b/test/unit/createDonationURL.spec.ts
index 08bbb23f9..bc34094f9 100644
--- a/test/unit/createDonationURL.spec.ts
+++ b/test/unit/createDonationURL.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
 import { createDonationURL } from '@src/createDonationURL';
+import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
 
 describe( 'createDonationURL', () => {
 	it( 'should create donation URL with tracking information', () => {
diff --git a/test/unit/createFallbackDonationURL.spec.ts b/test/unit/createFallbackDonationURL.spec.ts
index 942918b0e..334bac18c 100644
--- a/test/unit/createFallbackDonationURL.spec.ts
+++ b/test/unit/createFallbackDonationURL.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
 import { createFallbackDonationURL } from '@src/createFallbackDonationURL';
+import { ImpressionCountStub } from '@test/fixtures/ImpressionCountStub';
 
 describe( 'createFallbackDonationURL', () => {
 	it( 'should create donation URL with tracking information', () => {
diff --git a/test/unit/environment/prod/CampaignOverride.spec.ts b/test/unit/environment/prod/CampaignOverride.spec.ts
index cca0998f6..5428b7b35 100644
--- a/test/unit/environment/prod/CampaignOverride.spec.ts
+++ b/test/unit/environment/prod/CampaignOverride.spec.ts
@@ -1,6 +1,6 @@
-import { getCampaignParameterOverride } from '@src/environment/prod/CampaignParameterOverride';
 import { describe, expect, it } from 'vitest';
 import { CampaignParameters } from '@src/domain/CampaignParameters';
+import { getCampaignParameterOverride } from '@src/environment/prod/CampaignParameterOverride';
 
 describe( 'getCampaignParameterOverride (prod version)', () => {
 	it( 'Returns the input parameters', () => {
diff --git a/test/unit/tracking/LegacyEventTracking/mapNotShownEvent.spec.ts b/test/unit/tracking/LegacyEventTracking/mapNotShownEvent.spec.ts
index 077b9b4ca..8a009cec2 100644
--- a/test/unit/tracking/LegacyEventTracking/mapNotShownEvent.spec.ts
+++ b/test/unit/tracking/LegacyEventTracking/mapNotShownEvent.spec.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest';
 
-import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
-import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
 import { BannerNotShownReasons } from '@src/page/BannerNotShownReasons';
+import { NotShownEvent } from '@src/tracking/events/NotShownEvent';
+import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent';
 import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
 import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent';
 
diff --git a/test/unit/utils/DynamicContent/CampaignProjection.spec.ts b/test/unit/utils/DynamicContent/CampaignProjection.spec.ts
index b52ee78c1..aa6d3c813 100644
--- a/test/unit/utils/DynamicContent/CampaignProjection.spec.ts
+++ b/test/unit/utils/DynamicContent/CampaignProjection.spec.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it } from 'vitest';
-import TimeRange from '@src/utils/TimeRange';
 import { CampaignProjectionParameters } from '@src/domain/CampaignParameters';
 import { CampaignProjection } from '@src/utils/DynamicContent/CampaignProjection';
+import TimeRange from '@src/utils/TimeRange';
 
 const beforeStartDate = new Date( 2023, 10, 10 );
 const startDate = new Date( 2023, 10, 11 );
diff --git a/test/unit/utils/DynamicContent/DynamicCampaignText.spec.ts b/test/unit/utils/DynamicContent/DynamicCampaignText.spec.ts
index 4c06b1799..3e2ca7369 100644
--- a/test/unit/utils/DynamicContent/DynamicCampaignText.spec.ts
+++ b/test/unit/utils/DynamicContent/DynamicCampaignText.spec.ts
@@ -1,14 +1,14 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import DynamicCampaignText from '@src/utils/DynamicContent/DynamicCampaignText';
+import { CampaignParameters } from '@src/domain/CampaignParameters';
 import { Translator } from '@src/Translator';
+import DynamicCampaignText from '@src/utils/DynamicContent/DynamicCampaignText';
+import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
 import { Formatters } from '@src/utils/DynamicContent/Formatters';
 import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
-import { OrdinalEn } from '@src/utils/DynamicContent/formatters/OrdinalEn';
 import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
-import { CampaignParameters } from '@src/domain/CampaignParameters';
-import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent';
-import { ImpressionCount } from '@src/utils/ImpressionCount';
+import { OrdinalEn } from '@src/utils/DynamicContent/formatters/OrdinalEn';
 import { TimeEn } from '@src/utils/DynamicContent/formatters/TimeEn';
+import { ImpressionCount } from '@src/utils/ImpressionCount';
 
 const translator = new Translator( {
 	'campaign-day-nth-day': 'campaign day {{days}}',
diff --git a/test/unit/utils/DynamicContent/HourlyConfigurableDailyDonorAverage.spec.ts b/test/unit/utils/DynamicContent/HourlyConfigurableDailyDonorAverage.spec.ts
index 9a71a13b4..2fc158e96 100644
--- a/test/unit/utils/DynamicContent/HourlyConfigurableDailyDonorAverage.spec.ts
+++ b/test/unit/utils/DynamicContent/HourlyConfigurableDailyDonorAverage.spec.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it, test } from 'vitest';
+import { DailyDonorStatsValues } from '@src/utils/DynamicContent/DailyDonorAverage';
+import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
 import {
 	HourlyConfigurableDailyDonorAverage,
 	HourlyDonorPercentages
 } from '@src/utils/DynamicContent/HourlyConfigurableDailyDonorAverage';
-import { DailyDonorStatsValues } from '@src/utils/DynamicContent/DailyDonorAverage';
-import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
 
 const averageDailyDonors = 4760;
 const hourlyDonorPercentages: HourlyDonorPercentages = [ 1, 1, 1, 1, 1, 1, 5, 5, 5, 10, 10, 10, 10, 5, 5, 5, 5, 5, 5, 5, 1, 1, 1, 1 ];
diff --git a/test/unit/utils/DynamicContent/LinearDailyDonorAverage.spec.ts b/test/unit/utils/DynamicContent/LinearDailyDonorAverage.spec.ts
index 3cb14332f..9f77fbfed 100644
--- a/test/unit/utils/DynamicContent/LinearDailyDonorAverage.spec.ts
+++ b/test/unit/utils/DynamicContent/LinearDailyDonorAverage.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest';
 import { DailyDonorStatsValues } from '@src/utils/DynamicContent/DailyDonorAverage';
-import { LinearDailyDonorAverage } from '@src/utils/DynamicContent/LinearDailyDonorAverage';
 import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
+import { LinearDailyDonorAverage } from '@src/utils/DynamicContent/LinearDailyDonorAverage';
 
 const averageDailyDonors = 4760;
 describe( 'LinearDailyDonorAverage', () => {
diff --git a/test/unit/utils/DynamicContent/generators/CampaignDaySentence.spec.ts b/test/unit/utils/DynamicContent/generators/CampaignDaySentence.spec.ts
index ec1a44588..3c2113058 100644
--- a/test/unit/utils/DynamicContent/generators/CampaignDaySentence.spec.ts
+++ b/test/unit/utils/DynamicContent/generators/CampaignDaySentence.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it } from 'vitest';
-import { CampaignDaySentence } from '@src/utils/DynamicContent/generators/CampaignDaySentence';
-import TimeRange from '@src/utils/TimeRange';
 import { Translator } from '@src/Translator';
-import { OrdinalDe } from '@src/utils/DynamicContent/formatters/OrdinalDe';
 import { Ordinal } from '@src/utils/DynamicContent/formatters/Ordinal';
+import { OrdinalDe } from '@src/utils/DynamicContent/formatters/OrdinalDe';
+import { CampaignDaySentence } from '@src/utils/DynamicContent/generators/CampaignDaySentence';
+import TimeRange from '@src/utils/TimeRange';
 
 const beforeStartDate = new Date( 2023, 10, 10 );
 const startDate = new Date( 2023, 10, 11 );
diff --git a/test/unit/utils/DynamicContent/generators/CurrentDate.spec.ts b/test/unit/utils/DynamicContent/generators/CurrentDate.spec.ts
index 689b9f154..f5d3ec562 100644
--- a/test/unit/utils/DynamicContent/generators/CurrentDate.spec.ts
+++ b/test/unit/utils/DynamicContent/generators/CurrentDate.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest';
 import { Translator } from '@src/Translator';
-import { CurrentDate } from '@src/utils/DynamicContent/generators/CurrentDate';
 import { Ordinal } from '@src/utils/DynamicContent/formatters/Ordinal';
+import { CurrentDate } from '@src/utils/DynamicContent/generators/CurrentDate';
 
 const translator = new Translator( {
 	'date-month-1': 'Ick {{day}}',
diff --git a/test/unit/utils/DynamicContent/generators/DayName.spec.ts b/test/unit/utils/DynamicContent/generators/DayName.spec.ts
index 1b6f3c382..66e3bbb25 100644
--- a/test/unit/utils/DynamicContent/generators/DayName.spec.ts
+++ b/test/unit/utils/DynamicContent/generators/DayName.spec.ts
@@ -1,6 +1,6 @@
-import { describe, it, expect } from 'vitest';
-import { DayName } from '@src/utils/DynamicContent/generators/DayName';
+import { describe, expect, it } from 'vitest';
 import { Translator } from '@src/Translator';
+import { DayName } from '@src/utils/DynamicContent/generators/DayName';
 
 const translator = new Translator( {
 	'day-name-christmas-day': 'day-name-christmas-day',
diff --git a/test/unit/utils/DynamicContent/generators/DaysLeftSentence.spec.ts b/test/unit/utils/DynamicContent/generators/DaysLeftSentence.spec.ts
index 725c10301..5d4fceb18 100644
--- a/test/unit/utils/DynamicContent/generators/DaysLeftSentence.spec.ts
+++ b/test/unit/utils/DynamicContent/generators/DaysLeftSentence.spec.ts
@@ -1,7 +1,7 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
+import { Translator } from '@src/Translator';
 import { DaysLeftSentence } from '@src/utils/DynamicContent/generators/DaysLeftSentence';
 import TimeRange from '@src/utils/TimeRange';
-import { Translator } from '@src/Translator';
 
 describe( 'DaysLeftSentence', function () {
 	const translator = new Translator( {
diff --git a/test/unit/utils/DynamicContent/generators/DonorsNeededSentence.spec.ts b/test/unit/utils/DynamicContent/generators/DonorsNeededSentence.spec.ts
index 8584bd3be..7ef05c53b 100644
--- a/test/unit/utils/DynamicContent/generators/DonorsNeededSentence.spec.ts
+++ b/test/unit/utils/DynamicContent/generators/DonorsNeededSentence.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { DonorsNeededSentence } from '@src/utils/DynamicContent/generators/DonorsNeededSentence';
 import { Translator } from '@src/Translator';
+import { DonorsNeededSentence } from '@src/utils/DynamicContent/generators/DonorsNeededSentence';
 
 describe( 'DonorsNeededSentence', () => {
 	it( 'returns empty string if donors needed is zero', function () {
diff --git a/test/unit/utils/DynamicContent/generators/ProgressBarContent.spec.ts b/test/unit/utils/DynamicContent/generators/ProgressBarContent.spec.ts
index 9e8d3ba04..968c0df71 100644
--- a/test/unit/utils/DynamicContent/generators/ProgressBarContent.spec.ts
+++ b/test/unit/utils/DynamicContent/generators/ProgressBarContent.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
-import { ProgressBarContent } from '@src/utils/DynamicContent/generators/ProgressBarContent';
 import { Translator } from '@src/Translator';
 import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn';
+import { ProgressBarContent } from '@src/utils/DynamicContent/generators/ProgressBarContent';
 
 describe( 'ProgressBarContent', function () {
 	const progressBarContent = new ProgressBarContent(
diff --git a/test/unit/utils/DynamicContent/generators/VisitorsVsDonorsSentence.spec.ts b/test/unit/utils/DynamicContent/generators/VisitorsVsDonorsSentence.spec.ts
index 78bec5928..502a4f999 100644
--- a/test/unit/utils/DynamicContent/generators/VisitorsVsDonorsSentence.spec.ts
+++ b/test/unit/utils/DynamicContent/generators/VisitorsVsDonorsSentence.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
-import { VisitorsVsDonorsSentence } from '@src/utils/DynamicContent/generators/VisitorsVsDonorsSentence';
 import { TranslationMessages, Translator } from '@src/Translator';
 import { IntegerEn } from '@src/utils/DynamicContent/formatters/IntegerEn';
+import { VisitorsVsDonorsSentence } from '@src/utils/DynamicContent/generators/VisitorsVsDonorsSentence';
 
 describe( 'VisitorsVsDonorsSentence', function () {
 	it( 'returns the correct sentence when there is impressions', function () {
diff --git a/test/unit/utils/FormItemsBuilder/FormItemsBuilder.spec.ts b/test/unit/utils/FormItemsBuilder/FormItemsBuilder.spec.ts
index fbed4188e..3451b0d08 100644
--- a/test/unit/utils/FormItemsBuilder/FormItemsBuilder.spec.ts
+++ b/test/unit/utils/FormItemsBuilder/FormItemsBuilder.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it } from 'vitest';
-import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 import { Translator } from '@src/Translator';
+import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
 import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals';
 import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods';
-import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes';
+import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder';
 
 const formatter = ( amount: number ): string => 'formatted-' + amount.toString();
 const messages = {
diff --git a/test/unit/utils/RuntimeEnvironment.spec.ts b/test/unit/utils/RuntimeEnvironment.spec.ts
index 18f028b34..66ddcb02d 100644
--- a/test/unit/utils/RuntimeEnvironment.spec.ts
+++ b/test/unit/utils/RuntimeEnvironment.spec.ts
@@ -1,6 +1,6 @@
-import { describe, it, test, expect } from 'vitest';
+import { describe, expect, it, test } from 'vitest';
 
-import { UrlRuntimeEnvironment, LocationSlice } from '@src/utils/RuntimeEnvironment';
+import { LocationSlice, UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment';
 describe( 'UrlRuntimeEnvironment', function () {
 
 	const newLocation = ( queryParams: string ): LocationSlice => ( {
diff --git a/test/unit/utils/TimeRange.spec.ts b/test/unit/utils/TimeRange.spec.ts
index 32163bc67..1cddf9886 100644
--- a/test/unit/utils/TimeRange.spec.ts
+++ b/test/unit/utils/TimeRange.spec.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 
 import TimeRange from '@src/utils/TimeRange';
 
diff --git a/test/unit/validation/DonationFormValidator.spec.ts b/test/unit/validation/DonationFormValidator.spec.ts
index bf6389995..0c204114a 100644
--- a/test/unit/validation/DonationFormValidator.spec.ts
+++ b/test/unit/validation/DonationFormValidator.spec.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, test } from 'vitest';
-import { Validity } from '@src/utils/FormModel/Validity';
-import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
 import { useFormModel } from '@src/components/composables/useFormModel';
+import { AmountValidity } from '@src/utils/FormModel/AmountValidity';
+import { Validity } from '@src/utils/FormModel/Validity';
 import { DonationFormValidator } from '@src/validation/DonationFormValidator';
 import { resetFormModel } from '@test/resetFormModel';
 
diff --git a/webpack.common.js b/webpack.common.js
index 9911e2db2..8a123374a 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -1,5 +1,5 @@
-const path = require( 'path' );
 const { VueLoaderPlugin } = require( 'vue-loader' );
+const path = require( 'path' );
 
 const CampaignConfig = require( './webpack/campaign_config' );
 
diff --git a/webpack.config.js b/webpack.config.js
index 7fe67bf37..aab27115c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,13 +1,13 @@
-const fs = require( 'fs/promises' );
-const path = require( 'path' );
+const StyleLintPlugin = require( 'stylelint-webpack-plugin' );
 const toml = require( 'toml' );
-const { merge } = require( 'webpack-merge' );
-const CommonConfig = require( './webpack.common.js' );
 const webpack = require( 'webpack' );
+const { merge } = require( 'webpack-merge' );
 const { exec } = require( 'child_process' );
+const fs = require( 'fs/promises' );
+const path = require( 'path' );
 const webpackBuildApiRoute = require( './webpack/build_api' );
 const { campaignInfoToCampaignConfig } = require( './webpack/convert_info_to_type' );
-const StyleLintPlugin = require( 'stylelint-webpack-plugin' );
+const CommonConfig = require( './webpack.common.js' );
 
 const getBranch = () => new Promise( ( resolve ) => {
 	return exec( 'git rev-parse --abbrev-ref HEAD', ( err, stdout ) => {
diff --git a/webpack.production.js b/webpack.production.js
index 9c257aa63..418eecdfe 100644
--- a/webpack.production.js
+++ b/webpack.production.js
@@ -1,12 +1,11 @@
-const fs = require( 'fs' );
 const rimraf = require( 'rimraf' );
 const { mergeWithCustomize, customizeObject } = require( 'webpack-merge' );
-const CommonConfig = require( './webpack.common.js' );
-const MediaWikiTextWrapper = require( './webpack/mediawiki_text_wrapper' );
-const LoadVueOnWpde = require( './webpack/load_vue_on_wpde' );
-
-const CampaignConfig = require( './webpack/campaign_config' );
+const fs = require( 'fs' );
 const path = require( 'path' );
+const CampaignConfig = require( './webpack/campaign_config' );
+const LoadVueOnWpde = require( './webpack/load_vue_on_wpde' );
+const MediaWikiTextWrapper = require( './webpack/mediawiki_text_wrapper' );
+const CommonConfig = require( './webpack.common.js' );
 
 function readWrapperTemplate( name ) {
 	// eslint-disable-next-line security/detect-non-literal-fs-filename
diff --git a/webpack/build_channel.js b/webpack/build_channel.js
index 4872bd7ba..fae625987 100644
--- a/webpack/build_channel.js
+++ b/webpack/build_channel.js
@@ -1,9 +1,9 @@
 // This is a custom npm script that clears the `dist` directory and compiles all banners for a given channel.
 
-const webpack = require( 'webpack' );
 const rimraf = require( 'rimraf' );
-const newProductionConfiguration = require( '../webpack.production' );
+const webpack = require( 'webpack' );
 const CampaignConfig = require( './campaign_config' );
+const newProductionConfiguration = require( '../webpack.production' );
 
 if ( process.argv.length < 3 ) {
 	console.log( 'Please provide a channel name, e.g. "desktop", "mobile", "english", etc' );
diff --git a/webpack/campaign_config.js b/webpack/campaign_config.js
index 31fc4e2b0..2ed63eac8 100644
--- a/webpack/campaign_config.js
+++ b/webpack/campaign_config.js
@@ -1,6 +1,6 @@
-const path = require( 'path' );
 const { parse } = require( 'toml' );
 const { readFileSync } = require( 'fs' );
+const path = require( 'path' );
 
 function CampaignConfig( config ) {
 	this.config = config;
diff --git a/webpack/load_vue_on_wpde.js b/webpack/load_vue_on_wpde.js
index 966a8afb4..18ad33a61 100644
--- a/webpack/load_vue_on_wpde.js
+++ b/webpack/load_vue_on_wpde.js
@@ -5,8 +5,8 @@
  * @file
  */
 
-const { ConcatSource } = require( 'webpack-sources' );
 const { Compilation, ModuleFilenameHelpers } = require( 'webpack' );
+const { ConcatSource } = require( 'webpack-sources' );
 
 const loaderPrefix = ( url ) => `
 		/* Vue loader wrapper inserted by webpack load_vue_on_wpde */
diff --git a/webpack/mediawiki_text_wrapper.js b/webpack/mediawiki_text_wrapper.js
index dbb949fa9..ed01751d2 100644
--- a/webpack/mediawiki_text_wrapper.js
+++ b/webpack/mediawiki_text_wrapper.js
@@ -2,8 +2,8 @@
  * Wrap javascript assets in MediaWiki wikitext and script tags for inlining them in wiki pages
  */
 
-const Minimatch = require( 'minimatch' ).Minimatch;
 const Handlebars = require( 'handlebars' );
+const Minimatch = require( 'minimatch' ).Minimatch;
 
 function MediaWikiTextWrapper( options ) {
 	this.templates = {};