diff --git a/apps/client/src/AppRouter.tsx b/apps/client/src/AppRouter.tsx
index 70e3fb8bd..6aab1924a 100644
--- a/apps/client/src/AppRouter.tsx
+++ b/apps/client/src/AppRouter.tsx
@@ -22,7 +22,7 @@ const Editor = React.lazy(() => import('./features/editors/ProtectedEditor'));
 const Cuesheet = React.lazy(() => import('./views/cuesheet/ProtectedCuesheet'));
 const Operator = React.lazy(() => import('./features/operator/OperatorExport'));
 
-const TimerView = React.lazy(() => import('./features/viewers/timer/Timer'));
+const TimerView = React.lazy(() => import('./views/timer/Timer'));
 const MinimalTimerView = React.lazy(() => import('./features/viewers/minimal-timer/MinimalTimer'));
 const ClockView = React.lazy(() => import('./features/viewers/clock/Clock'));
 const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdown'));
diff --git a/apps/client/src/features/viewers/timer/Timer.scss b/apps/client/src/views/timer/Timer.scss
similarity index 99%
rename from apps/client/src/features/viewers/timer/Timer.scss
rename to apps/client/src/views/timer/Timer.scss
index 1e8bf1d28..e900ef669 100644
--- a/apps/client/src/features/viewers/timer/Timer.scss
+++ b/apps/client/src/views/timer/Timer.scss
@@ -1,4 +1,4 @@
-@use '../../../theme/viewerDefs' as *;
+@use '../../theme/viewerDefs' as *;
 
 .stage-timer {
   margin: 0;
diff --git a/apps/client/src/features/viewers/timer/Timer.tsx b/apps/client/src/views/timer/Timer.tsx
similarity index 90%
rename from apps/client/src/features/viewers/timer/Timer.tsx
rename to apps/client/src/views/timer/Timer.tsx
index 447800ad1..58acc16b2 100644
--- a/apps/client/src/features/viewers/timer/Timer.tsx
+++ b/apps/client/src/views/timer/Timer.tsx
@@ -13,17 +13,22 @@ import {
   ViewSettings,
 } from 'ontime-types';
 
-import { FitText } from '../../../common/components/fit-text/FitText';
-import MultiPartProgressBar from '../../../common/components/multi-part-progress-bar/MultiPartProgressBar';
-import TitleCard from '../../../common/components/title-card/TitleCard';
-import ViewLogo from '../../../common/components/view-logo/ViewLogo';
-import ViewParamsEditor from '../../../common/components/view-params-editor/ViewParamsEditor';
-import { useWindowTitle } from '../../../common/hooks/useWindowTitle';
-import { ViewExtendedTimer } from '../../../common/models/TimeManager.type';
-import { formatTime, getDefaultFormat } from '../../../common/utils/time';
-import { useTranslation } from '../../../translation/TranslationProvider';
-import SuperscriptTime from '../common/superscript-time/SuperscriptTime';
-import { getFormattedTimer, getPropertyValue, getTimerByType, isStringBoolean } from '../common/viewUtils';
+import { FitText } from '../../common/components/fit-text/FitText';
+import MultiPartProgressBar from '../../common/components/multi-part-progress-bar/MultiPartProgressBar';
+import TitleCard from '../../common/components/title-card/TitleCard';
+import ViewLogo from '../../common/components/view-logo/ViewLogo';
+import ViewParamsEditor from '../../common/components/view-params-editor/ViewParamsEditor';
+import { useWindowTitle } from '../../common/hooks/useWindowTitle';
+import { ViewExtendedTimer } from '../../common/models/TimeManager.type';
+import { formatTime, getDefaultFormat } from '../../common/utils/time';
+import SuperscriptTime from '../../features/viewers/common/superscript-time/SuperscriptTime';
+import {
+  getFormattedTimer,
+  getPropertyValue,
+  getTimerByType,
+  isStringBoolean,
+} from '../../features/viewers/common/viewUtils';
+import { useTranslation } from '../../translation/TranslationProvider';
 
 import { getTimerOptions } from './timer.options';
 
diff --git a/apps/client/src/features/viewers/timer/timer.options.ts b/apps/client/src/views/timer/timer.options.ts
similarity index 93%
rename from apps/client/src/features/viewers/timer/timer.options.ts
rename to apps/client/src/views/timer/timer.options.ts
index 430d1fc4f..193bcf665 100644
--- a/apps/client/src/features/viewers/timer/timer.options.ts
+++ b/apps/client/src/views/timer/timer.options.ts
@@ -5,8 +5,8 @@ import {
   hideTimerSeconds,
   makeOptionsFromCustomFields,
   showLeadingZeros,
-} from '../../../common/components/view-params-editor/constants';
-import { ViewOption } from '../../../common/components/view-params-editor/types';
+} from '../../common/components/view-params-editor/constants';
+import { ViewOption } from '../../common/components/view-params-editor/types';
 
 export const getTimerOptions = (timeFormat: string, customFields: CustomFields): ViewOption[] => {
   const mainOptions = makeOptionsFromCustomFields(customFields, { title: 'Title', note: 'Note' });