diff --git a/apps/client/src/AppRouter.tsx b/apps/client/src/AppRouter.tsx
index 24789c754..70e3fb8bd 100644
--- a/apps/client/src/AppRouter.tsx
+++ b/apps/client/src/AppRouter.tsx
@@ -19,7 +19,7 @@ import { ONTIME_VERSION } from './ONTIME_VERSION';
 import { sentryDsn, sentryRecommendedIgnore } from './sentry.config';
 
 const Editor = React.lazy(() => import('./features/editors/ProtectedEditor'));
-const Cuesheet = React.lazy(() => import('./features/cuesheet/ProtectedCuesheet'));
+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'));
diff --git a/apps/client/src/common/api/db.ts b/apps/client/src/common/api/db.ts
index dcc1af003..e9a29b3da 100644
--- a/apps/client/src/common/api/db.ts
+++ b/apps/client/src/common/api/db.ts
@@ -1,7 +1,7 @@
 import axios, { AxiosResponse } from 'axios';
 import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';
 
-import { makeCSV, makeTable } from '../../features/cuesheet/cuesheetUtils';
+import { makeCSV, makeTable } from '../../views/cuesheet/cuesheet.utils';
 
 import { apiEntryUrl } from './constants';
 import { createBlob, downloadBlob } from './utils';
diff --git a/apps/client/src/features/cuesheet/Cuesheet.module.scss b/apps/client/src/views/cuesheet/Cuesheet.module.scss
similarity index 100%
rename from apps/client/src/features/cuesheet/Cuesheet.module.scss
rename to apps/client/src/views/cuesheet/Cuesheet.module.scss
diff --git a/apps/client/src/features/cuesheet/Cuesheet.tsx b/apps/client/src/views/cuesheet/Cuesheet.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/Cuesheet.tsx
rename to apps/client/src/views/cuesheet/Cuesheet.tsx
diff --git a/apps/client/src/features/cuesheet/CuesheetWrapper.module.scss b/apps/client/src/views/cuesheet/CuesheetWrapper.module.scss
similarity index 100%
rename from apps/client/src/features/cuesheet/CuesheetWrapper.module.scss
rename to apps/client/src/views/cuesheet/CuesheetWrapper.module.scss
diff --git a/apps/client/src/features/cuesheet/CuesheetWrapper.tsx b/apps/client/src/views/cuesheet/CuesheetWrapper.tsx
similarity index 98%
rename from apps/client/src/features/cuesheet/CuesheetWrapper.tsx
rename to apps/client/src/views/cuesheet/CuesheetWrapper.tsx
index efb71ae81..f6b9cab87 100644
--- a/apps/client/src/features/cuesheet/CuesheetWrapper.tsx
+++ b/apps/client/src/views/cuesheet/CuesheetWrapper.tsx
@@ -11,7 +11,7 @@ import { useCuesheet } from '../../common/hooks/useSocket';
 import { useWindowTitle } from '../../common/hooks/useWindowTitle';
 import useCustomFields from '../../common/hooks-query/useCustomFields';
 import { useFlatRundown } from '../../common/hooks-query/useRundown';
-import { CuesheetOverview } from '../overview/Overview';
+import { CuesheetOverview } from '../../features/overview/Overview';
 
 import CuesheetProgress from './cuesheet-progress/CuesheetProgress';
 import { useCuesheetSettings } from './store/CuesheetSettings';
diff --git a/apps/client/src/features/cuesheet/ProtectedCuesheet.tsx b/apps/client/src/views/cuesheet/ProtectedCuesheet.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/ProtectedCuesheet.tsx
rename to apps/client/src/views/cuesheet/ProtectedCuesheet.tsx
diff --git a/apps/client/src/features/cuesheet/__tests__/__snapshots__/utils.test.js.snap b/apps/client/src/views/cuesheet/__tests__/__snapshots__/utils.test.js.snap
similarity index 100%
rename from apps/client/src/features/cuesheet/__tests__/__snapshots__/utils.test.js.snap
rename to apps/client/src/views/cuesheet/__tests__/__snapshots__/utils.test.js.snap
diff --git a/apps/client/src/features/cuesheet/__tests__/utils.test.js b/apps/client/src/views/cuesheet/__tests__/utils.test.js
similarity index 100%
rename from apps/client/src/features/cuesheet/__tests__/utils.test.js
rename to apps/client/src/views/cuesheet/__tests__/utils.test.js
diff --git a/apps/client/src/features/cuesheet/cuesheet-progress/CuesheetProgress.module.scss b/apps/client/src/views/cuesheet/cuesheet-progress/CuesheetProgress.module.scss
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-progress/CuesheetProgress.module.scss
rename to apps/client/src/views/cuesheet/cuesheet-progress/CuesheetProgress.module.scss
diff --git a/apps/client/src/features/cuesheet/cuesheet-progress/CuesheetProgress.tsx b/apps/client/src/views/cuesheet/cuesheet-progress/CuesheetProgress.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-progress/CuesheetProgress.tsx
rename to apps/client/src/views/cuesheet/cuesheet-progress/CuesheetProgress.tsx
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-elements/BlockRow.tsx b/apps/client/src/views/cuesheet/cuesheet-table-elements/BlockRow.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-elements/BlockRow.tsx
rename to apps/client/src/views/cuesheet/cuesheet-table-elements/BlockRow.tsx
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-elements/CuesheetHeader.tsx b/apps/client/src/views/cuesheet/cuesheet-table-elements/CuesheetHeader.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-elements/CuesheetHeader.tsx
rename to apps/client/src/views/cuesheet/cuesheet-table-elements/CuesheetHeader.tsx
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-elements/DelayRow.tsx b/apps/client/src/views/cuesheet/cuesheet-table-elements/DelayRow.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-elements/DelayRow.tsx
rename to apps/client/src/views/cuesheet/cuesheet-table-elements/DelayRow.tsx
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-elements/EditableCell.tsx b/apps/client/src/views/cuesheet/cuesheet-table-elements/EditableCell.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-elements/EditableCell.tsx
rename to apps/client/src/views/cuesheet/cuesheet-table-elements/EditableCell.tsx
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-elements/EventRow.tsx b/apps/client/src/views/cuesheet/cuesheet-table-elements/EventRow.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-elements/EventRow.tsx
rename to apps/client/src/views/cuesheet/cuesheet-table-elements/EventRow.tsx
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-elements/SortableCell.tsx b/apps/client/src/views/cuesheet/cuesheet-table-elements/SortableCell.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-elements/SortableCell.tsx
rename to apps/client/src/views/cuesheet/cuesheet-table-elements/SortableCell.tsx
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-header/CuesheetTableHeader.module.scss b/apps/client/src/views/cuesheet/cuesheet-table-header/CuesheetTableHeader.module.scss
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-header/CuesheetTableHeader.module.scss
rename to apps/client/src/views/cuesheet/cuesheet-table-header/CuesheetTableHeader.module.scss
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-header/CuesheetTableHeader.tsx b/apps/client/src/views/cuesheet/cuesheet-table-header/CuesheetTableHeader.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-header/CuesheetTableHeader.tsx
rename to apps/client/src/views/cuesheet/cuesheet-table-header/CuesheetTableHeader.tsx
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-header/CuesheetTableHeaderTimers.tsx b/apps/client/src/views/cuesheet/cuesheet-table-header/CuesheetTableHeaderTimers.tsx
similarity index 79%
rename from apps/client/src/features/cuesheet/cuesheet-table-header/CuesheetTableHeaderTimers.tsx
rename to apps/client/src/views/cuesheet/cuesheet-table-header/CuesheetTableHeaderTimers.tsx
index 147e15a47..fdd6e032c 100644
--- a/apps/client/src/features/cuesheet/cuesheet-table-header/CuesheetTableHeaderTimers.tsx
+++ b/apps/client/src/views/cuesheet/cuesheet-table-header/CuesheetTableHeaderTimers.tsx
@@ -1,6 +1,6 @@
 import { useClock, useTimer } from '../../../common/hooks/useSocket';
-import ClockTime from '../../viewers/common/clock-time/ClockTime';
-import RunningTime from '../../viewers/common/running-time/RunningTime';
+import ClockTime from '../../../features/viewers/common/clock-time/ClockTime';
+import RunningTime from '../../../features/viewers/common/running-time/RunningTime';
 
 import style from './CuesheetTableHeader.module.scss';
 
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-settings/CuesheetTableSettings.module.scss b/apps/client/src/views/cuesheet/cuesheet-table-settings/CuesheetTableSettings.module.scss
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-settings/CuesheetTableSettings.module.scss
rename to apps/client/src/views/cuesheet/cuesheet-table-settings/CuesheetTableSettings.module.scss
diff --git a/apps/client/src/features/cuesheet/cuesheet-table-settings/CuesheetTableSettings.tsx b/apps/client/src/views/cuesheet/cuesheet-table-settings/CuesheetTableSettings.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheet-table-settings/CuesheetTableSettings.tsx
rename to apps/client/src/views/cuesheet/cuesheet-table-settings/CuesheetTableSettings.tsx
diff --git a/apps/client/src/features/cuesheet/cuesheetCols.tsx b/apps/client/src/views/cuesheet/cuesheetCols.tsx
similarity index 97%
rename from apps/client/src/features/cuesheet/cuesheetCols.tsx
rename to apps/client/src/views/cuesheet/cuesheetCols.tsx
index 29d8a3c06..24b9ab850 100644
--- a/apps/client/src/features/cuesheet/cuesheetCols.tsx
+++ b/apps/client/src/views/cuesheet/cuesheetCols.tsx
@@ -4,7 +4,7 @@ import { CellContext, ColumnDef } from '@tanstack/react-table';
 import { CustomFields, isOntimeEvent, OntimeEvent, OntimeRundownEntry } from 'ontime-types';
 
 import DelayIndicator from '../../common/components/delay-indicator/DelayIndicator';
-import RunningTime from '../viewers/common/running-time/RunningTime';
+import RunningTime from '../../features/viewers/common/running-time/RunningTime';
 
 import EditableCell from './cuesheet-table-elements/EditableCell';
 import { useCuesheetSettings } from './store/CuesheetSettings';
diff --git a/apps/client/src/features/cuesheet/cuesheetUtils.ts b/apps/client/src/views/cuesheet/cuesheetUtils.ts
similarity index 100%
rename from apps/client/src/features/cuesheet/cuesheetUtils.ts
rename to apps/client/src/views/cuesheet/cuesheetUtils.ts
diff --git a/apps/client/src/features/cuesheet/defaults.ts b/apps/client/src/views/cuesheet/defaults.ts
similarity index 100%
rename from apps/client/src/features/cuesheet/defaults.ts
rename to apps/client/src/views/cuesheet/defaults.ts
diff --git a/apps/client/src/features/cuesheet/store/CuesheetSettings.tsx b/apps/client/src/views/cuesheet/store/CuesheetSettings.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/store/CuesheetSettings.tsx
rename to apps/client/src/views/cuesheet/store/CuesheetSettings.tsx
diff --git a/apps/client/src/features/cuesheet/useColumnManager.tsx b/apps/client/src/views/cuesheet/useColumnManager.tsx
similarity index 100%
rename from apps/client/src/features/cuesheet/useColumnManager.tsx
rename to apps/client/src/views/cuesheet/useColumnManager.tsx