diff --git a/apps/client/src/AppRouter.tsx b/apps/client/src/AppRouter.tsx
index 8287542ec..6a88dfef1 100644
--- a/apps/client/src/AppRouter.tsx
+++ b/apps/client/src/AppRouter.tsx
@@ -29,7 +29,7 @@ const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdow
 
 const Backstage = React.lazy(() => import('./views/backstage/Backstage'));
 const Timeline = React.lazy(() => import('./views/timeline/TimelinePage'));
-const Public = React.lazy(() => import('./features/viewers/public/Public'));
+const Public = React.lazy(() => import('./views/public/Public'));
 const Lower = React.lazy(() => import('./features/viewers/lower-thirds/LowerThird'));
 const StudioClock = React.lazy(() => import('./features/viewers/studio/StudioClock'));
 const ProjectInfo = React.lazy(() => import('./views/project-info/ProjectInfo'));
diff --git a/apps/client/src/features/viewers/public/Public.scss b/apps/client/src/views/public/Public.scss
similarity index 98%
rename from apps/client/src/features/viewers/public/Public.scss
rename to apps/client/src/views/public/Public.scss
index 04b5ddc5c..e4c577677 100644
--- a/apps/client/src/features/viewers/public/Public.scss
+++ b/apps/client/src/views/public/Public.scss
@@ -1,4 +1,4 @@
-@use '../../../theme/viewerDefs' as *;
+@use '../../theme/viewerDefs' as *;
 
 .public-screen {
   margin: 0;
diff --git a/apps/client/src/features/viewers/public/Public.tsx b/apps/client/src/views/public/Public.tsx
similarity index 79%
rename from apps/client/src/features/viewers/public/Public.tsx
rename to apps/client/src/views/public/Public.tsx
index db61f8645..3f174100a 100644
--- a/apps/client/src/features/viewers/public/Public.tsx
+++ b/apps/client/src/views/public/Public.tsx
@@ -3,17 +3,17 @@ import { useSearchParams } from 'react-router-dom';
 import { AnimatePresence, motion } from 'framer-motion';
 import { CustomFields, OntimeEvent, ProjectData, Settings } from 'ontime-types';
 
-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 PublicSchedule from '../../../views/common/schedule/PublicSchedule';
-import { titleVariants } from '../common/animation';
-import SuperscriptTime from '../common/superscript-time/SuperscriptTime';
-import { getPropertyValue } from '../common/viewUtils';
+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 { getPropertyValue } from '../../features/viewers/common/viewUtils';
+import { useTranslation } from '../../translation/TranslationProvider';
+import PublicSchedule from '../common/schedule/PublicSchedule';
+import { titleVariants } from '../timer/timer.animations';
 
 import { getPublicOptions } from './public.options';
 
diff --git a/apps/client/src/features/viewers/public/public.options.ts b/apps/client/src/views/public/public.options.ts
similarity index 91%
rename from apps/client/src/features/viewers/public/public.options.ts
rename to apps/client/src/views/public/public.options.ts
index 817390762..210abf12e 100644
--- a/apps/client/src/features/viewers/public/public.options.ts
+++ b/apps/client/src/views/public/public.options.ts
@@ -4,8 +4,8 @@ import {
   getTimeOption,
   makeOptionsFromCustomFields,
   OptionTitle,
-} 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 getPublicOptions = (timeFormat: string, customFields: CustomFields): ViewOption[] => {
   const secondaryOptions = makeOptionsFromCustomFields(customFields, { note: 'Note' });