From c32e171c47de924a79b7aa5e8268dae845e1d792 Mon Sep 17 00:00:00 2001
From: Henrik Nygren <nygrenh@gmail.com>
Date: Fri, 6 Oct 2023 14:11:40 +0300
Subject: [PATCH] Fix stuff (#1185)

* Sort peer review questions in the editor

* Rename old quiz types to use Old -prefix

* Remove duplicate type

* Move quizzes components around

* Fixes to received peer review sorting

* Add a warning to users of really old browsers

* Fixes to the outdated browser warning

* Increase max peer review question length
---
 .../cms/src/components/PeerReviewEditor.tsx   | 12 ++-
 services/cms/src/pages/_app.tsx               |  5 ++
 .../Essay.tsx                                 |  0
 .../Likert.tsx                                |  0
 .../ReceivedPeerReview.tsx}                   | 27 +++++-
 .../SVGmatcher.tsx                            |  0
 .../index.tsx                                 | 60 +++++++------
 .../moocfi/ExerciseBlock/index.tsx            |  2 +-
 services/course-material/src/pages/_app.tsx   | 23 +++--
 ...reate_peer_review_question_length.down.sql |  2 +
 ...ncreate_peer_review_question_length.up.sql |  2 +
 services/main-frontend/src/pages/_app.tsx     |  5 ++
 .../components/SubmissionComponents/index.tsx | 18 ----
 .../impl-by-quiz-item-type}/Checkbox.tsx      |  8 +-
 .../impl-by-quiz-item-type}/ChooseN.tsx       | 10 +--
 .../ClosedEndedQuestion.tsx                   | 14 +--
 .../impl-by-quiz-item-type}/Essay.tsx         | 10 +--
 .../impl-by-quiz-item-type}/Matrix/Matrix.tsx |  6 +-
 .../Matrix/MatrixCell.tsx                     |  0
 .../MultipleChoice.tsx                        | 20 ++---
 .../MultipleChoiceDropdown.tsx                | 10 +--
 .../impl-by-quiz-item-type}/Scale.tsx         | 12 +--
 .../impl-by-quiz-item-type}/Timeline.tsx      |  8 +-
 .../impl-by-quiz-item-type}/Unsupported.tsx   |  2 +-
 .../impl-by-quiz-item-type}/index.tsx         | 16 ++--
 .../AnswerExercise/index.tsx}                 | 12 +--
 .../ExerciseEditor}/QuizCommonInfo.tsx        | 12 +--
 .../QuizComponents/QuizEditor.tsx             |  2 +-
 .../QuizComponents/checkbox/index.tsx         |  8 +-
 .../QuizComponents/choose-n/index.tsx         | 14 +--
 .../closed-ended-question/index.tsx           | 14 +--
 .../QuizComponents/common/EditorCard.tsx      |  6 +-
 .../QuizComponents/common/MessageDialog.tsx   |  0
 .../common/MultipleChoiceOption.tsx           |  8 +-
 .../QuizComponents/common/ParsedTextField.tsx |  4 +-
 .../QuizComponents/common/ToggleCard.tsx      |  2 +-
 .../QuizComponents/essay/index.tsx            |  6 +-
 .../matrix/TableCellContent.tsx               |  2 +-
 .../QuizComponents/matrix/TableContent.tsx    |  4 +-
 .../QuizComponents/matrix/index.tsx           |  0
 .../multiple-choice-dropdown/index.tsx        | 16 ++--
 .../QuizComponents/multiple-choice/index.tsx  | 16 ++--
 .../QuizComponents/scale/index.tsx            |  6 +-
 .../timeline/TimelineContent.tsx              | 14 +--
 .../QuizComponents/timeline/index.tsx         |  0
 .../QuizComponents/unsupported/index.tsx      |  0
 .../QuizCreation/QuizOption.tsx               |  6 +-
 .../ExerciseEditor}/QuizCreation/index.tsx    |  6 +-
 .../ExerciseEditor/index.tsx}                 |  8 +-
 .../ExerciseEditor}/utils/general.tsx         |  2 +-
 .../{ => exercise-service-views}/Renderer.tsx | 11 ++-
 .../impl-by-quiz-item-type}/Checkbox.tsx      |  8 +-
 .../impl-by-quiz-item-type}/ChooseN.tsx       | 12 +--
 .../Closed-ended-question.tsx                 | 14 +--
 .../impl-by-quiz-item-type}/Essay.tsx         | 10 +--
 .../impl-by-quiz-item-type}/Matrix.tsx        |  8 +-
 .../MultipleChoice.tsx                        | 20 ++---
 .../MultipleChoiceDropdown.tsx                | 12 +--
 .../impl-by-quiz-item-type}/Scale.tsx         | 12 +--
 .../impl-by-quiz-item-type}/Timeline.tsx      | 10 +--
 .../impl-by-quiz-item-type}/Unsupported.tsx   |  6 +-
 .../impl-by-quiz-item-type/index.tsx          | 18 ++++
 .../ViewSubmission/index.tsx}                 | 40 ++++-----
 services/quizzes/src/grading/utils.ts         | 10 +--
 .../quizzes/src/pages/api/model-solution.ts   |  8 +-
 services/quizzes/src/pages/api/public-spec.ts |  6 +-
 services/quizzes/src/pages/iframe.tsx         | 36 ++++----
 services/quizzes/src/util/migrate.ts          | 37 ++++----
 .../src/util/migration/migrationSettings.ts   | 19 ++--
 .../util/migration/modelSolutionSpecQuiz.ts   | 10 +--
 .../src/util/migration/privateSpecQuiz.ts     | 17 ++--
 .../src/util/migration/publicSpecQuiz.ts      |  6 +-
 .../src/util/migration/userAnswerSpec.ts      |  8 +-
 .../quizzes/tests/api/utils/quizGenerator.ts  | 22 ++---
 .../modelSolutionSpecMigration.test.ts        | 35 ++++----
 .../privateSpecMigration.test.ts              |  6 +-
 .../publicSpecMigration.test.ts               | 32 +++----
 .../userAnswerMigration.test.ts               |  2 +-
 .../util/migrationTests/utils/comparison.ts   | 33 +++----
 .../utils/exerciseGeneration.ts               | 84 +++++++++---------
 .../utils/userAnswerGeneration.ts             | 32 +++----
 .../types/{types.d.ts => oldQuizTypes.ts}     | 88 +++++++++----------
 .../types/quizTypes/modelSolutionSpec.ts      | 11 ---
 .../quizzes/types/quizTypes/oldQuizTypes.ts   |  1 +
 .../quizzes/types/quizTypes/privateSpec.ts    | 11 ---
 shared-module/src/locales/en/cms.json         |  1 +
 shared-module/src/utils/constants.ts          |  1 +
 87 files changed, 587 insertions(+), 550 deletions(-)
 rename services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/{PeerReviewReceivedComponent => PeerReviewsReceivedComponent}/Essay.tsx (100%)
 rename services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/{PeerReviewReceivedComponent => PeerReviewsReceivedComponent}/Likert.tsx (100%)
 rename services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/{PeerReviewReceivedComponent/PeerReviewQuestionAnswer.tsx => PeerReviewsReceivedComponent/ReceivedPeerReview.tsx} (62%)
 rename services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/{PeerReviewReceivedComponent => PeerReviewsReceivedComponent}/SVGmatcher.tsx (100%)
 rename services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/{PeerReviewReceivedComponent => PeerReviewsReceivedComponent}/index.tsx (73%)
 create mode 100644 services/headless-lms/migrations/20231006092702_increate_peer_review_question_length.down.sql
 create mode 100644 services/headless-lms/migrations/20231006092702_increate_peer_review_question_length.up.sql
 delete mode 100644 services/quizzes/src/components/SubmissionComponents/index.tsx
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/Checkbox.tsx (84%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/ChooseN.tsx (87%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/ClosedEndedQuestion.tsx (84%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/Essay.tsx (88%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/Matrix/Matrix.tsx (94%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/Matrix/MatrixCell.tsx (100%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/MultipleChoice.tsx (86%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/MultipleChoiceDropdown.tsx (92%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/Scale.tsx (86%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/Timeline.tsx (97%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/Unsupported.tsx (87%)
 rename services/quizzes/src/components/{widget => exercise-service-views/AnswerExercise/impl-by-quiz-item-type}/index.tsx (94%)
 rename services/quizzes/src/components/{AnswerExercise.tsx => exercise-service-views/AnswerExercise/index.tsx} (78%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizCommonInfo.tsx (86%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/QuizEditor.tsx (94%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/checkbox/index.tsx (83%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/choose-n/index.tsx (93%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/closed-ended-question/index.tsx (93%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/common/EditorCard.tsx (96%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/common/MessageDialog.tsx (100%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/common/MultipleChoiceOption.tsx (95%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/common/ParsedTextField.tsx (94%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/common/ToggleCard.tsx (97%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/essay/index.tsx (87%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/matrix/TableCellContent.tsx (98%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/matrix/TableContent.tsx (94%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/matrix/index.tsx (100%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/multiple-choice-dropdown/index.tsx (95%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/multiple-choice/index.tsx (95%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/scale/index.tsx (88%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/timeline/TimelineContent.tsx (92%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/timeline/index.tsx (100%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizComponents/unsupported/index.tsx (100%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizCreation/QuizOption.tsx (87%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/QuizCreation/index.tsx (96%)
 rename services/quizzes/src/components/{ExerciseEditor.tsx => exercise-service-views/ExerciseEditor/index.tsx} (71%)
 rename services/quizzes/src/components/{QuizV2 => exercise-service-views/ExerciseEditor}/utils/general.tsx (98%)
 rename services/quizzes/src/components/{ => exercise-service-views}/Renderer.tsx (86%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/Checkbox.tsx (87%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/ChooseN.tsx (80%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/Closed-ended-question.tsx (82%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/Essay.tsx (80%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/Matrix.tsx (94%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/MultipleChoice.tsx (89%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/MultipleChoiceDropdown.tsx (92%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/Scale.tsx (84%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/Timeline.tsx (94%)
 rename services/quizzes/src/components/{SubmissionComponents => exercise-service-views/ViewSubmission/impl-by-quiz-item-type}/Unsupported.tsx (63%)
 create mode 100644 services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/index.tsx
 rename services/quizzes/src/components/{ViewSubmission.tsx => exercise-service-views/ViewSubmission/index.tsx} (90%)
 rename services/quizzes/types/{types.d.ts => oldQuizTypes.ts} (80%)

diff --git a/services/cms/src/components/PeerReviewEditor.tsx b/services/cms/src/components/PeerReviewEditor.tsx
index 80186aa57e44..268fef50417d 100644
--- a/services/cms/src/components/PeerReviewEditor.tsx
+++ b/services/cms/src/components/PeerReviewEditor.tsx
@@ -95,8 +95,6 @@ const StyledQuestionType = styled.div`
   }
 `
 
-const HEADING_TEXT = "Configure review answers option"
-
 export interface PeerReviewEditorExtraProps {
   attributes: Readonly<Partial<ExerciseAttributes>>
   setAttributes: (attr: Partial<ExerciseAttributes>) => void
@@ -407,10 +405,11 @@ const PeerReviewEditor: React.FC<PeerReviewEditorProps> = ({
                     handlePeerReviewValueChange(value, "accepting_threshold")
                   }}
                 />
-                <h2>{HEADING_TEXT}</h2>
+                <h2>{t("configure-review-answers-option")}</h2>
                 {parsedPeerReviewQuestionConfig &&
-                  parsedPeerReviewQuestionConfig.map(
-                    ({ id, question, question_type, answer_required }) => (
+                  parsedPeerReviewQuestionConfig
+                    .sort((o1, o2) => o1.order_number - o2.order_number)
+                    .map(({ id, question, question_type, answer_required }) => (
                       <List key={id} id={id}>
                         <StyledQuestion>
                           <StyledSelectField
@@ -450,8 +449,7 @@ const PeerReviewEditor: React.FC<PeerReviewEditorProps> = ({
                           <FontAwesomeIcon icon={faXmark} />
                         </DeleteBtn>
                       </List>
-                    ),
-                  )}
+                    ))}
                 <Button
                   variant="primary"
                   size="medium"
diff --git a/services/cms/src/pages/_app.tsx b/services/cms/src/pages/_app.tsx
index eae40fd91816..938f7a5ef15d 100644
--- a/services/cms/src/pages/_app.tsx
+++ b/services/cms/src/pages/_app.tsx
@@ -2,6 +2,7 @@ import { config } from "@fortawesome/fontawesome-svg-core"
 import { QueryClientProvider } from "@tanstack/react-query"
 import type { AppProps } from "next/app"
 import Head from "next/head"
+import Script from "next/script"
 import React, { useEffect } from "react"
 
 import Layout from "../components/Layout"
@@ -9,6 +10,7 @@ import { LoginStateContextProvider } from "../shared-module/contexts/LoginStateC
 import useLanguage from "../shared-module/hooks/useLanguage"
 import { queryClient } from "../shared-module/services/appQueryClient"
 import GlobalStyles from "../shared-module/styles/GlobalStyles"
+import { OUTDATED_BROWSER_WARNING_SCRIPT } from "../shared-module/utils/constants"
 import generateWebVitalsReporter from "../shared-module/utils/generateWebVitalsReporter"
 import initI18n from "../shared-module/utils/initI18n"
 import "../styles/Gutenberg/style.scss"
@@ -44,6 +46,9 @@ const MyApp: React.FC<React.PropsWithChildren<AppProps>> = ({ Component, pagePro
 
   return (
     <>
+      <Script noModule id="outdated-browser-warning">
+        {OUTDATED_BROWSER_WARNING_SCRIPT}
+      </Script>
       {language && (
         <Head>
           <html lang={language} />
diff --git a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/Essay.tsx b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/Essay.tsx
similarity index 100%
rename from services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/Essay.tsx
rename to services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/Essay.tsx
diff --git a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/Likert.tsx b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/Likert.tsx
similarity index 100%
rename from services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/Likert.tsx
rename to services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/Likert.tsx
diff --git a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/PeerReviewQuestionAnswer.tsx b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/ReceivedPeerReview.tsx
similarity index 62%
rename from services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/PeerReviewQuestionAnswer.tsx
rename to services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/ReceivedPeerReview.tsx
index 43c79ce34045..bf7d3f0cd0e5 100644
--- a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/PeerReviewQuestionAnswer.tsx
+++ b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/ReceivedPeerReview.tsx
@@ -1,5 +1,6 @@
 import styled from "@emotion/styled"
 import * as React from "react"
+import { useMemo } from "react"
 import { useTranslation } from "react-i18next"
 
 import {
@@ -25,19 +26,37 @@ const Heading = styled.div`
   border-bottom: 2px solid #ebedee;
 `
 
-const PeerReviewQuestionAnswer: React.FunctionComponent<ReviewProps> = ({
+const ReceivedPeerReview: React.FunctionComponent<ReviewProps> = ({
   orderNumber,
   review,
   questions,
 }) => {
   const { t } = useTranslation()
-  // const { id, number_data, text_data, peer_review_question_id } = review
+
+  const sortedReview = useMemo(
+    () =>
+      review.sort((o1, o2) => {
+        const o1Question = questions.find((q) => q.id === o1.peer_review_question_id)
+        const o2Question = questions.find((q) => q.id === o2.peer_review_question_id)
+        if (!o1Question) {
+          return 1
+        }
+        if (!o2Question) {
+          return -1
+        }
+        return o1Question.order_number - o2Question.order_number
+      }),
+    [questions, review],
+  )
 
   return (
     <Wrapper>
       <Heading>{`${t("peer-review")} #${orderNumber + 1}`}</Heading>
-      {review?.map(({ id, number_data, text_data, peer_review_question_id }, index) => {
+      {sortedReview.map(({ id, number_data, text_data, peer_review_question_id }, index) => {
         const questionIndex = questions.findIndex((q) => q.id === peer_review_question_id)
+        if (questionIndex === -1) {
+          return null
+        }
         const question = questions[questionIndex].question
         return (
           <>
@@ -52,4 +71,4 @@ const PeerReviewQuestionAnswer: React.FunctionComponent<ReviewProps> = ({
   )
 }
 
-export default PeerReviewQuestionAnswer
+export default ReceivedPeerReview
diff --git a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/SVGmatcher.tsx b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/SVGmatcher.tsx
similarity index 100%
rename from services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/SVGmatcher.tsx
rename to services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/SVGmatcher.tsx
diff --git a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/index.tsx b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/index.tsx
similarity index 73%
rename from services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/index.tsx
rename to services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/index.tsx
index f7c3b6a4aab0..5f913fc1a294 100644
--- a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewReceivedComponent/index.tsx
+++ b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/PeerReviewView/PeerReviewsReceivedComponent/index.tsx
@@ -3,18 +3,15 @@ import styled from "@emotion/styled"
 import { useQuery } from "@tanstack/react-query"
 import { groupBy } from "lodash"
 import * as React from "react"
+import { useMemo } from "react"
 import { useTranslation } from "react-i18next"
 
 import { fetchPeerReviewDataReceivedByExerciseId } from "../../../../../../services/backend"
-import {
-  PeerReviewQuestion,
-  PeerReviewQuestionSubmission,
-} from "../../../../../../shared-module/bindings"
 import ErrorBanner from "../../../../../../shared-module/components/ErrorBanner"
 import Spinner from "../../../../../../shared-module/components/Spinner"
 import { baseTheme, headingFont } from "../../../../../../shared-module/styles"
 
-import PeerReviewQuestionAnswer from "./PeerReviewQuestionAnswer"
+import ReceivedPeerReview from "./ReceivedPeerReview"
 
 const openAnimation = keyframes`
   0% { opacity: 0; }
@@ -108,16 +105,37 @@ interface PeerReviewProps {
   submissionId: string
 }
 
-const PeerReview: React.FunctionComponent<PeerReviewProps> = ({ id, submissionId }) => {
+const PeerReviewsReceived: React.FunctionComponent<PeerReviewProps> = ({ id, submissionId }) => {
   const { t } = useTranslation()
-  let result: PeerReviewQuestionSubmission[] = []
-  let questions: PeerReviewQuestion[] = []
 
   const getPeerReviewReceived = useQuery({
     queryKey: [`exercise-${id}-exercise-slide-submission-${submissionId}-peer-reviews-received`],
     queryFn: () => fetchPeerReviewDataReceivedByExerciseId(id, submissionId),
   })
 
+  const data = useMemo(() => {
+    const ordered = getPeerReviewReceived.data?.peer_review_question_submissions.sort(
+      (a, b) => b.created_at.getTime() - a.created_at.getTime(),
+    )
+
+    const groupByPeerReviewSubmissionId = groupBy(
+      ordered,
+      (review) => review.peer_review_submission_id,
+    )
+
+    let res = Object.values(groupByPeerReviewSubmissionId)
+    res = res.sort((a, b) => {
+      if (a.length === 0) {
+        return 1
+      }
+      if (b.length === 0) {
+        return -1
+      }
+      return b[0].created_at.getTime() - a[0].created_at.getTime()
+    })
+    return res
+  }, [getPeerReviewReceived.data?.peer_review_question_submissions])
+
   if (getPeerReviewReceived.isLoading) {
     return <Spinner variant={"medium"} />
   }
@@ -126,35 +144,19 @@ const PeerReview: React.FunctionComponent<PeerReviewProps> = ({ id, submissionId
     return <ErrorBanner variant={"readOnly"} error={getPeerReviewReceived.error} />
   }
 
-  if (
-    getPeerReviewReceived.isSuccess &&
-    getPeerReviewReceived.data.peer_review_question_submissions.length > 0
-  ) {
-    const { peer_review_questions, peer_review_question_submissions } = getPeerReviewReceived.data
-    result = peer_review_question_submissions
-    questions = peer_review_questions
-  }
-
-  const ordered = result.sort((a, b) => b.created_at.getTime() - a.created_at.getTime())
-
-  const groupByPeerReviewSubmissionId = groupBy(
-    ordered,
-    (review) => review.peer_review_submission_id,
-  )
-
   return (
     <Wrapper>
       <details>
         <summary>
           {t("peer-reviews-received-from-other-student")}
-          <Notification>{Object.keys(groupByPeerReviewSubmissionId).length ?? "0"}</Notification>
+          <Notification>{data.length ?? "0"}</Notification>
         </summary>
-        {Object.values(groupByPeerReviewSubmissionId).map((item, index) => (
-          <PeerReviewQuestionAnswer
+        {data.map((item, index) => (
+          <ReceivedPeerReview
             orderNumber={index}
             key={index}
             review={item}
-            questions={questions}
+            questions={getPeerReviewReceived.data.peer_review_questions}
           />
         ))}
       </details>
@@ -162,4 +164,4 @@ const PeerReview: React.FunctionComponent<PeerReviewProps> = ({ id, submissionId
   )
 }
 
-export default PeerReview
+export default PeerReviewsReceived
diff --git a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/index.tsx b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/index.tsx
index 5338424dac80..d1dcbea69296 100644
--- a/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/index.tsx
+++ b/services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/index.tsx
@@ -35,7 +35,7 @@ import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary
 import ExerciseTask from "./ExerciseTask"
 import GradingState from "./GradingState"
 import PeerReviewView from "./PeerReviewView"
-import PeerReviewReceived from "./PeerReviewView/PeerReviewReceivedComponent/index"
+import PeerReviewReceived from "./PeerReviewView/PeerReviewsReceivedComponent/index"
 import WaitingForPeerReviews from "./PeerReviewView/WaitingForPeerReviews"
 
 interface ExerciseBlockAttributes {
diff --git a/services/course-material/src/pages/_app.tsx b/services/course-material/src/pages/_app.tsx
index 9bf3eb00525b..ceae04173633 100644
--- a/services/course-material/src/pages/_app.tsx
+++ b/services/course-material/src/pages/_app.tsx
@@ -1,6 +1,7 @@
 import { config } from "@fortawesome/fontawesome-svg-core"
 import { QueryClientProvider } from "@tanstack/react-query"
 import type { AppProps } from "next/app"
+import Script from "next/script"
 import React, { useEffect } from "react"
 
 import Layout from "../components/layout/Layout"
@@ -8,6 +9,7 @@ import { LoginStateContextProvider } from "../shared-module/contexts/LoginStateC
 import useLanguage from "../shared-module/hooks/useLanguage"
 import { queryClient } from "../shared-module/services/appQueryClient"
 import GlobalStyles from "../shared-module/styles/GlobalStyles"
+import { OUTDATED_BROWSER_WARNING_SCRIPT } from "../shared-module/utils/constants"
 import generateWebVitalsReporter from "../shared-module/utils/generateWebVitalsReporter"
 import initI18n from "../shared-module/utils/initI18n"
 
@@ -42,14 +44,19 @@ const MyApp: React.FC<React.PropsWithChildren<AppProps>> = ({ Component, pagePro
   }, [language])
 
   return (
-    <QueryClientProvider client={queryClient}>
-      <GlobalStyles />
-      <LoginStateContextProvider>
-        <Layout>
-          <Component {...pageProps} />
-        </Layout>
-      </LoginStateContextProvider>
-    </QueryClientProvider>
+    <>
+      <Script noModule id="outdated-browser-warning">
+        {OUTDATED_BROWSER_WARNING_SCRIPT}
+      </Script>
+      <QueryClientProvider client={queryClient}>
+        <GlobalStyles />
+        <LoginStateContextProvider>
+          <Layout>
+            <Component {...pageProps} />
+          </Layout>
+        </LoginStateContextProvider>
+      </QueryClientProvider>
+    </>
   )
 }
 
diff --git a/services/headless-lms/migrations/20231006092702_increate_peer_review_question_length.down.sql b/services/headless-lms/migrations/20231006092702_increate_peer_review_question_length.down.sql
new file mode 100644
index 000000000000..f3c78f9c4adc
--- /dev/null
+++ b/services/headless-lms/migrations/20231006092702_increate_peer_review_question_length.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE peer_review_questions
+ALTER COLUMN question TYPE VARCHAR(128);
diff --git a/services/headless-lms/migrations/20231006092702_increate_peer_review_question_length.up.sql b/services/headless-lms/migrations/20231006092702_increate_peer_review_question_length.up.sql
new file mode 100644
index 000000000000..b04bacaa55e6
--- /dev/null
+++ b/services/headless-lms/migrations/20231006092702_increate_peer_review_question_length.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE peer_review_questions
+ALTER COLUMN question TYPE VARCHAR(1000);
diff --git a/services/main-frontend/src/pages/_app.tsx b/services/main-frontend/src/pages/_app.tsx
index 273c8f1edce4..0155f36b202d 100644
--- a/services/main-frontend/src/pages/_app.tsx
+++ b/services/main-frontend/src/pages/_app.tsx
@@ -2,6 +2,7 @@ import { config } from "@fortawesome/fontawesome-svg-core"
 import { QueryClientProvider } from "@tanstack/react-query"
 import type { AppProps } from "next/app"
 import Head from "next/head"
+import Script from "next/script"
 import React, { useEffect } from "react"
 
 import Layout from "../components/Layout"
@@ -9,6 +10,7 @@ import { LoginStateContextProvider } from "../shared-module/contexts/LoginStateC
 import useLanguage from "../shared-module/hooks/useLanguage"
 import { queryClient } from "../shared-module/services/appQueryClient"
 import GlobalStyles from "../shared-module/styles/GlobalStyles"
+import { OUTDATED_BROWSER_WARNING_SCRIPT } from "../shared-module/utils/constants"
 import generateWebVitalsReporter from "../shared-module/utils/generateWebVitalsReporter"
 import initI18n from "../shared-module/utils/initI18n"
 
@@ -43,6 +45,9 @@ const MyApp: React.FC<React.PropsWithChildren<AppProps>> = ({ Component, pagePro
 
   return (
     <>
+      <Script noModule id="outdated-browser-warning">
+        {OUTDATED_BROWSER_WARNING_SCRIPT}
+      </Script>
       {language && (
         <Head>
           <html lang={language} />
diff --git a/services/quizzes/src/components/SubmissionComponents/index.tsx b/services/quizzes/src/components/SubmissionComponents/index.tsx
deleted file mode 100644
index 6288fcc9e14a..000000000000
--- a/services/quizzes/src/components/SubmissionComponents/index.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { UserItemAnswer } from "../../../types/quizTypes/answer"
-import { ModelSolutionQuizItem } from "../../../types/quizTypes/modelSolutionSpec"
-import { PublicSpecQuizItem } from "../../../types/quizTypes/publicSpec"
-import { ItemAnswerFeedback } from "../../grading/feedback"
-import { UserInformation } from "../../shared-module/exercise-service-protocol-types"
-import { FlexDirection } from "../../util/css-sanitization"
-
-export interface QuizItemSubmissionComponentProps<
-  T extends PublicSpecQuizItem,
-  K extends UserItemAnswer,
-> {
-  public_quiz_item: T
-  quiz_direction: FlexDirection
-  quiz_item_model_solution: ModelSolutionQuizItem | null
-  quiz_item_feedback: ItemAnswerFeedback | null
-  user_quiz_item_answer: K
-  user_information: UserInformation
-}
diff --git a/services/quizzes/src/components/widget/Checkbox.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Checkbox.tsx
similarity index 84%
rename from services/quizzes/src/components/widget/Checkbox.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Checkbox.tsx
index c327495c0199..118adf350788 100644
--- a/services/quizzes/src/components/widget/Checkbox.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Checkbox.tsx
@@ -1,10 +1,10 @@
 import { css } from "@emotion/css"
 import React from "react"
 
-import { UserItemAnswerCheckbox } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemCheckbox } from "../../../types/quizTypes/publicSpec"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import MarkdownText from "../MarkdownText"
+import { UserItemAnswerCheckbox } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemCheckbox } from "../../../../../types/quizTypes/publicSpec"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import MarkdownText from "../../../MarkdownText"
 
 import { QuizItemComponentProps } from "."
 
diff --git a/services/quizzes/src/components/widget/ChooseN.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/ChooseN.tsx
similarity index 87%
rename from services/quizzes/src/components/widget/ChooseN.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/ChooseN.tsx
index d68f4550934b..779b4bce7f96 100644
--- a/services/quizzes/src/components/widget/ChooseN.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/ChooseN.tsx
@@ -2,11 +2,11 @@ import { css } from "@emotion/css"
 import _ from "lodash"
 import React from "react"
 
-import { UserItemAnswerChooseN } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemChooseN } from "../../../types/quizTypes/publicSpec"
-import { respondToOrLarger } from "../../shared-module/styles/respond"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import { quizTheme } from "../../styles/QuizStyles"
+import { UserItemAnswerChooseN } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemChooseN } from "../../../../../types/quizTypes/publicSpec"
+import { respondToOrLarger } from "../../../../shared-module/styles/respond"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import { quizTheme } from "../../../../styles/QuizStyles"
 
 import { QuizItemComponentProps } from "."
 
diff --git a/services/quizzes/src/components/widget/ClosedEndedQuestion.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/ClosedEndedQuestion.tsx
similarity index 84%
rename from services/quizzes/src/components/widget/ClosedEndedQuestion.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/ClosedEndedQuestion.tsx
index 59681707e47a..31466f54d924 100644
--- a/services/quizzes/src/components/widget/ClosedEndedQuestion.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/ClosedEndedQuestion.tsx
@@ -1,13 +1,13 @@
 import React, { useCallback, useId } from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswerClosedEndedQuestion } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemClosedEndedQuestion } from "../../../types/quizTypes/publicSpec"
-import TextField from "../../shared-module/components/InputFields/TextField"
-import { stripNonPrintableCharacters } from "../../shared-module/utils/strings"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import MarkdownText from "../MarkdownText"
-import CloseEndedQuestionWrapper from "../Shared/CloseEndedQuestionWrapper"
+import { UserItemAnswerClosedEndedQuestion } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemClosedEndedQuestion } from "../../../../../types/quizTypes/publicSpec"
+import TextField from "../../../../shared-module/components/InputFields/TextField"
+import { stripNonPrintableCharacters } from "../../../../shared-module/utils/strings"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import MarkdownText from "../../../MarkdownText"
+import CloseEndedQuestionWrapper from "../../../Shared/CloseEndedQuestionWrapper"
 
 import { QuizItemComponentProps } from "."
 
diff --git a/services/quizzes/src/components/widget/Essay.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Essay.tsx
similarity index 88%
rename from services/quizzes/src/components/widget/Essay.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Essay.tsx
index 774151507aea..e7c20dec5283 100644
--- a/services/quizzes/src/components/widget/Essay.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Essay.tsx
@@ -2,11 +2,11 @@ import { css } from "@emotion/css"
 import React, { useMemo } from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswerEssay } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemEssay } from "../../../types/quizTypes/publicSpec"
-import TextArea from "../../shared-module/components/InputFields/TextAreaField"
-import { wordCount } from "../../shared-module/utils/strings"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
+import { UserItemAnswerEssay } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemEssay } from "../../../../../types/quizTypes/publicSpec"
+import TextArea from "../../../../shared-module/components/InputFields/TextAreaField"
+import { wordCount } from "../../../../shared-module/utils/strings"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
 
 import { QuizItemComponentProps } from "."
 
diff --git a/services/quizzes/src/components/widget/Matrix/Matrix.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Matrix/Matrix.tsx
similarity index 94%
rename from services/quizzes/src/components/widget/Matrix/Matrix.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Matrix/Matrix.tsx
index f9f601455405..66d64027579e 100644
--- a/services/quizzes/src/components/widget/Matrix/Matrix.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Matrix/Matrix.tsx
@@ -2,9 +2,9 @@ import styled from "@emotion/styled"
 import React, { useCallback, useEffect, useMemo, useState } from "react"
 
 import { QuizItemComponentProps } from ".."
-import { UserItemAnswerMatrix } from "../../../../types/quizTypes/answer"
-import { PublicSpecQuizItemMatrix } from "../../../../types/quizTypes/publicSpec"
-import withErrorBoundary from "../../../shared-module/utils/withErrorBoundary"
+import { UserItemAnswerMatrix } from "../../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemMatrix } from "../../../../../../types/quizTypes/publicSpec"
+import withErrorBoundary from "../../../../../shared-module/utils/withErrorBoundary"
 
 import MatrixCell from "./MatrixCell"
 
diff --git a/services/quizzes/src/components/widget/Matrix/MatrixCell.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Matrix/MatrixCell.tsx
similarity index 100%
rename from services/quizzes/src/components/widget/Matrix/MatrixCell.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Matrix/MatrixCell.tsx
diff --git a/services/quizzes/src/components/widget/MultipleChoice.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/MultipleChoice.tsx
similarity index 86%
rename from services/quizzes/src/components/widget/MultipleChoice.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/MultipleChoice.tsx
index 6577e1246360..0abca51f10d0 100644
--- a/services/quizzes/src/components/widget/MultipleChoice.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/MultipleChoice.tsx
@@ -3,16 +3,16 @@ import _ from "lodash"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswerMultiplechoice } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemMultiplechoice } from "../../../types/quizTypes/publicSpec"
-import { baseTheme } from "../../shared-module/styles"
-import { respondToOrLarger } from "../../shared-module/styles/respond"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import { quizTheme } from "../../styles/QuizStyles"
-import { COLUMN, ROW } from "../../util/constants"
-import { sanitizeFlexDirection } from "../../util/css-sanitization"
-import { orderArrayWithId } from "../../util/randomizer"
-import ParsedText from "../ParsedText"
+import { UserItemAnswerMultiplechoice } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemMultiplechoice } from "../../../../../types/quizTypes/publicSpec"
+import { baseTheme } from "../../../../shared-module/styles"
+import { respondToOrLarger } from "../../../../shared-module/styles/respond"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import { quizTheme } from "../../../../styles/QuizStyles"
+import { COLUMN, ROW } from "../../../../util/constants"
+import { sanitizeFlexDirection } from "../../../../util/css-sanitization"
+import { orderArrayWithId } from "../../../../util/randomizer"
+import ParsedText from "../../../ParsedText"
 
 import { QuizItemComponentProps } from "."
 
diff --git a/services/quizzes/src/components/widget/MultipleChoiceDropdown.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/MultipleChoiceDropdown.tsx
similarity index 92%
rename from services/quizzes/src/components/widget/MultipleChoiceDropdown.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/MultipleChoiceDropdown.tsx
index f207a8b8a0df..04e31ffd7b19 100644
--- a/services/quizzes/src/components/widget/MultipleChoiceDropdown.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/MultipleChoiceDropdown.tsx
@@ -2,11 +2,11 @@ import { css } from "@emotion/css"
 import { useMemo } from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswerMultiplechoiceDropdown } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemMultiplechoiceDropdown } from "../../../types/quizTypes/publicSpec"
-import { respondToOrLarger } from "../../shared-module/styles/respond"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import { quizTheme } from "../../styles/QuizStyles"
+import { UserItemAnswerMultiplechoiceDropdown } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemMultiplechoiceDropdown } from "../../../../../types/quizTypes/publicSpec"
+import { respondToOrLarger } from "../../../../shared-module/styles/respond"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import { quizTheme } from "../../../../styles/QuizStyles"
 
 import { QuizItemComponentProps } from "."
 
diff --git a/services/quizzes/src/components/widget/Scale.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Scale.tsx
similarity index 86%
rename from services/quizzes/src/components/widget/Scale.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Scale.tsx
index 20ba359392a1..4db4973f1956 100644
--- a/services/quizzes/src/components/widget/Scale.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Scale.tsx
@@ -1,12 +1,12 @@
 import { css } from "@emotion/css"
 import React, { useId } from "react"
 
-import { UserItemAnswerScale } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemScale } from "../../../types/quizTypes/publicSpec"
-import { primaryFont } from "../../shared-module/styles"
-import { respondToOrLarger } from "../../shared-module/styles/respond"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import MarkdownText from "../MarkdownText"
+import { UserItemAnswerScale } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemScale } from "../../../../../types/quizTypes/publicSpec"
+import { primaryFont } from "../../../../shared-module/styles"
+import { respondToOrLarger } from "../../../../shared-module/styles/respond"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import MarkdownText from "../../../MarkdownText"
 
 import { QuizItemComponentProps } from "."
 
diff --git a/services/quizzes/src/components/widget/Timeline.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Timeline.tsx
similarity index 97%
rename from services/quizzes/src/components/widget/Timeline.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Timeline.tsx
index daed8dfa90e4..e3d10b1b3b31 100644
--- a/services/quizzes/src/components/widget/Timeline.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Timeline.tsx
@@ -3,13 +3,13 @@ import styled from "@emotion/styled"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { TimelineChoice, UserItemAnswerTimeline } from "../../../types/quizTypes/answer"
+import { TimelineChoice, UserItemAnswerTimeline } from "../../../../../types/quizTypes/answer"
 import {
   PublicSpecQuizItemTimeline,
   PublicSpecQuizItemTimelineItem,
-} from "../../../types/quizTypes/publicSpec"
-import SelectMenu from "../../shared-module/components/SelectMenu"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
+} from "../../../../../types/quizTypes/publicSpec"
+import SelectMenu from "../../../../shared-module/components/SelectMenu"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
 
 import { QuizItemComponentProps } from "."
 
diff --git a/services/quizzes/src/components/widget/Unsupported.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Unsupported.tsx
similarity index 87%
rename from services/quizzes/src/components/widget/Unsupported.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Unsupported.tsx
index 2d1f71e5d569..616ff8175f06 100644
--- a/services/quizzes/src/components/widget/Unsupported.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/Unsupported.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from "react-i18next"
 
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
 
 const Unsupported: React.FC = () => {
   const { t } = useTranslation()
diff --git a/services/quizzes/src/components/widget/index.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/index.tsx
similarity index 94%
rename from services/quizzes/src/components/widget/index.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/index.tsx
index 7a45a4ba4bce..17f9a344fb19 100644
--- a/services/quizzes/src/components/widget/index.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/impl-by-quiz-item-type/index.tsx
@@ -12,7 +12,7 @@ import {
   UserItemAnswerMultiplechoiceDropdown,
   UserItemAnswerScale,
   UserItemAnswerTimeline,
-} from "../../../types/quizTypes/answer"
+} from "../../../../../types/quizTypes/answer"
 import {
   PublicSpecQuiz,
   PublicSpecQuizItem,
@@ -25,13 +25,13 @@ import {
   PublicSpecQuizItemMultiplechoiceDropdown,
   PublicSpecQuizItemScale,
   PublicSpecQuizItemTimeline,
-} from "../../../types/quizTypes/publicSpec"
-import useQuizzesUserAnswerOutputState from "../../hooks/useQuizzesUserAnswerServiceOutputState"
-import { UserInformation } from "../../shared-module/exercise-service-protocol-types"
-import { UpdateFunction } from "../../shared-module/hooks/exerciseServiceHooks/useExerciseServiceOutputState"
-import { COLUMN, QUIZ_ITEM_CLASS } from "../../util/constants"
-import { FlexDirection, sanitizeFlexDirection } from "../../util/css-sanitization"
-import FlexWrapper from "../FlexWrapper"
+} from "../../../../../types/quizTypes/publicSpec"
+import useQuizzesUserAnswerOutputState from "../../../../hooks/useQuizzesUserAnswerServiceOutputState"
+import { UserInformation } from "../../../../shared-module/exercise-service-protocol-types"
+import { UpdateFunction } from "../../../../shared-module/hooks/exerciseServiceHooks/useExerciseServiceOutputState"
+import { COLUMN, QUIZ_ITEM_CLASS } from "../../../../util/constants"
+import { FlexDirection, sanitizeFlexDirection } from "../../../../util/css-sanitization"
+import FlexWrapper from "../../../FlexWrapper"
 
 import Checkbox from "./Checkbox"
 import ChooseN from "./ChooseN"
diff --git a/services/quizzes/src/components/AnswerExercise.tsx b/services/quizzes/src/components/exercise-service-views/AnswerExercise/index.tsx
similarity index 78%
rename from services/quizzes/src/components/AnswerExercise.tsx
rename to services/quizzes/src/components/exercise-service-views/AnswerExercise/index.tsx
index f804d13a5a5e..fd6fcb47ac99 100644
--- a/services/quizzes/src/components/AnswerExercise.tsx
+++ b/services/quizzes/src/components/exercise-service-views/AnswerExercise/index.tsx
@@ -1,11 +1,11 @@
 import React, { useCallback, useMemo, useState } from "react"
 
-import { UserAnswer } from "../../types/quizTypes/answer"
-import { PublicSpecQuiz } from "../../types/quizTypes/publicSpec"
-import QuizzesUserItemAnswerContext from "../contexts/QuizzesUserItemAnswerContext"
-import { UserInformation } from "../shared-module/exercise-service-protocol-types"
+import { UserAnswer } from "../../../../types/quizTypes/answer"
+import { PublicSpecQuiz } from "../../../../types/quizTypes/publicSpec"
+import QuizzesUserItemAnswerContext from "../../../contexts/QuizzesUserItemAnswerContext"
+import { UserInformation } from "../../../shared-module/exercise-service-protocol-types"
 
-import Widget from "./widget"
+import AnswerExerciseImpl from "./impl-by-quiz-item-type"
 
 export interface ExerciseProps {
   port: MessagePort
@@ -51,7 +51,7 @@ const Exercise: React.FC<React.PropsWithChildren<ExerciseProps>> = ({
         validate,
       }}
     >
-      <Widget
+      <AnswerExerciseImpl
         publicSpec={publicSpec}
         previousSubmission={previousSubmission}
         user_information={user_information}
diff --git a/services/quizzes/src/components/QuizV2/QuizCommonInfo.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizCommonInfo.tsx
similarity index 86%
rename from services/quizzes/src/components/QuizV2/QuizCommonInfo.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizCommonInfo.tsx
index d3cc7ee51e08..5f4cc6b801c9 100644
--- a/services/quizzes/src/components/QuizV2/QuizCommonInfo.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizCommonInfo.tsx
@@ -2,12 +2,12 @@ import styled from "@emotion/styled"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { PrivateSpecQuiz } from "../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../hooks/useQuizzesExerciseServiceOutputState"
-import Accordion from "../../shared-module/components/Accordion"
-import RadioButton from "../../shared-module/components/InputFields/RadioButton"
-import { baseTheme, primaryFont } from "../../shared-module/styles"
-import MarkdownEditor from "../MarkdownEditor"
+import { PrivateSpecQuiz } from "../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../hooks/useQuizzesExerciseServiceOutputState"
+import Accordion from "../../../shared-module/components/Accordion"
+import RadioButton from "../../../shared-module/components/InputFields/RadioButton"
+import { baseTheme, primaryFont } from "../../../shared-module/styles"
+import MarkdownEditor from "../../MarkdownEditor"
 
 const AdvancedOptionsContainer = styled.div`
   padding: 8px;
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/QuizEditor.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/QuizEditor.tsx
similarity index 94%
rename from services/quizzes/src/components/QuizV2/QuizComponents/QuizEditor.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/QuizEditor.tsx
index ca1bd6b2f248..e39d75fa61df 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/QuizEditor.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/QuizEditor.tsx
@@ -1,4 +1,4 @@
-import { PrivateSpecQuizItem } from "../../../../types/quizTypes/privateSpec"
+import { PrivateSpecQuizItem } from "../../../../../types/quizTypes/privateSpec"
 
 import CheckboxEditor from "./checkbox"
 import ChooseNEditor from "./choose-n"
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/checkbox/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/checkbox/index.tsx
similarity index 83%
rename from services/quizzes/src/components/QuizV2/QuizComponents/checkbox/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/checkbox/index.tsx
index 88bb1dbf8525..6129f5f1f4f3 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/checkbox/index.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/checkbox/index.tsx
@@ -2,10 +2,10 @@ import styled from "@emotion/styled"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { PrivateSpecQuizItemCheckbox } from "../../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
-import CheckBox from "../../../../shared-module/components/InputFields/CheckBox"
-import TextField from "../../../../shared-module/components/InputFields/TextField"
+import { PrivateSpecQuizItemCheckbox } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
+import CheckBox from "../../../../../shared-module/components/InputFields/CheckBox"
+import TextField from "../../../../../shared-module/components/InputFields/TextField"
 import findQuizItem from "../../utils/general"
 import EditorCard from "../common/EditorCard"
 
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/choose-n/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/choose-n/index.tsx
similarity index 93%
rename from services/quizzes/src/components/QuizV2/QuizComponents/choose-n/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/choose-n/index.tsx
index 8111246072b4..4cbc7f9f019b 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/choose-n/index.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/choose-n/index.tsx
@@ -3,13 +3,13 @@ import React, { useState } from "react"
 import { useTranslation } from "react-i18next"
 import { v4 } from "uuid"
 
-import { PrivateSpecQuizItemChooseN } from "../../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
-import Accordion from "../../../../shared-module/components/Accordion"
-import Button from "../../../../shared-module/components/Button"
-import CheckBox from "../../../../shared-module/components/InputFields/CheckBox"
-import TextField from "../../../../shared-module/components/InputFields/TextField"
-import { primaryFont } from "../../../../shared-module/styles"
+import { PrivateSpecQuizItemChooseN } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
+import Accordion from "../../../../../shared-module/components/Accordion"
+import Button from "../../../../../shared-module/components/Button"
+import CheckBox from "../../../../../shared-module/components/InputFields/CheckBox"
+import TextField from "../../../../../shared-module/components/InputFields/TextField"
+import { primaryFont } from "../../../../../shared-module/styles"
 import findQuizItem from "../../utils/general"
 import EditorCard from "../common/EditorCard"
 import MultipleChoiceOption from "../common/MultipleChoiceOption"
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/closed-ended-question/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/closed-ended-question/index.tsx
similarity index 93%
rename from services/quizzes/src/components/QuizV2/QuizComponents/closed-ended-question/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/closed-ended-question/index.tsx
index 5f75cb62931d..8dd60fc9c725 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/closed-ended-question/index.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/closed-ended-question/index.tsx
@@ -4,13 +4,13 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import React, { useState } from "react"
 import { useTranslation } from "react-i18next"
 
-import { PrivateSpecQuizItemClosedEndedQuestion } from "../../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
-import Accordion from "../../../../shared-module/components/Accordion"
-import RadioButton from "../../../../shared-module/components/InputFields/RadioButton"
-import SelectField from "../../../../shared-module/components/InputFields/SelectField"
-import TextField from "../../../../shared-module/components/InputFields/TextField"
-import { primaryFont } from "../../../../shared-module/styles"
+import { PrivateSpecQuizItemClosedEndedQuestion } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
+import Accordion from "../../../../../shared-module/components/Accordion"
+import RadioButton from "../../../../../shared-module/components/InputFields/RadioButton"
+import SelectField from "../../../../../shared-module/components/InputFields/SelectField"
+import TextField from "../../../../../shared-module/components/InputFields/TextField"
+import { primaryFont } from "../../../../../shared-module/styles"
 import findQuizItem from "../../utils/general"
 import EditorCard from "../common/EditorCard"
 
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/common/EditorCard.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/EditorCard.tsx
similarity index 96%
rename from services/quizzes/src/components/QuizV2/QuizComponents/common/EditorCard.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/EditorCard.tsx
index 5c1ffd1bea26..f29d0af00cee 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/common/EditorCard.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/EditorCard.tsx
@@ -3,9 +3,9 @@ import { faArrowDown, faArrowUp, faTrash } from "@fortawesome/free-solid-svg-ico
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import React from "react"
 
-import { PrivateSpecQuiz, PrivateSpecQuizItem } from "../../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
-import Button from "../../../../shared-module/components/Button"
+import { PrivateSpecQuiz, PrivateSpecQuizItem } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
+import Button from "../../../../../shared-module/components/Button"
 
 interface EditorCardProps {
   title: string
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/common/MessageDialog.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/MessageDialog.tsx
similarity index 100%
rename from services/quizzes/src/components/QuizV2/QuizComponents/common/MessageDialog.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/MessageDialog.tsx
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/common/MultipleChoiceOption.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/MultipleChoiceOption.tsx
similarity index 95%
rename from services/quizzes/src/components/QuizV2/QuizComponents/common/MultipleChoiceOption.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/MultipleChoiceOption.tsx
index 28fbb9e403e2..1fd25059182e 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/common/MultipleChoiceOption.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/MultipleChoiceOption.tsx
@@ -4,10 +4,10 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import React, { useState } from "react"
 import { useTranslation } from "react-i18next"
 
-import { QuizItemOption } from "../../../../../types/quizTypes/privateSpec"
-import CheckBox from "../../../../shared-module/components/InputFields/CheckBox"
-import TextField from "../../../../shared-module/components/InputFields/TextField"
-import { primaryFont } from "../../../../shared-module/styles"
+import { QuizItemOption } from "../../../../../../types/quizTypes/privateSpec"
+import CheckBox from "../../../../../shared-module/components/InputFields/CheckBox"
+import TextField from "../../../../../shared-module/components/InputFields/TextField"
+import { primaryFont } from "../../../../../shared-module/styles"
 
 const OptionCard = styled.div`
   height: 50px;
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/common/ParsedTextField.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/ParsedTextField.tsx
similarity index 94%
rename from services/quizzes/src/components/QuizV2/QuizComponents/common/ParsedTextField.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/ParsedTextField.tsx
index 8d886f220886..05a9eacf27b6 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/common/ParsedTextField.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/ParsedTextField.tsx
@@ -4,8 +4,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import React, { useState } from "react"
 import { useTranslation } from "react-i18next"
 
-import TextField from "../../../../shared-module/components/InputFields/TextField"
-import ParsedText from "../../../ParsedText"
+import TextField from "../../../../../shared-module/components/InputFields/TextField"
+import ParsedText from "../../../../ParsedText"
 
 const DisplayContainer = styled.div`
   display: flex;
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/common/ToggleCard.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/ToggleCard.tsx
similarity index 97%
rename from services/quizzes/src/components/QuizV2/QuizComponents/common/ToggleCard.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/ToggleCard.tsx
index 2e4d97a2f9f8..cd426758a6a0 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/common/ToggleCard.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/common/ToggleCard.tsx
@@ -1,7 +1,7 @@
 import styled from "@emotion/styled"
 import React from "react"
 
-import { primaryFont } from "../../../../shared-module/styles"
+import { primaryFont } from "../../../../../shared-module/styles"
 
 interface ToggleCardProps {
   state: boolean
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/essay/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/essay/index.tsx
similarity index 87%
rename from services/quizzes/src/components/QuizV2/QuizComponents/essay/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/essay/index.tsx
index 9bf3949ca23e..da61e0cd5239 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/essay/index.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/essay/index.tsx
@@ -2,9 +2,9 @@ import styled from "@emotion/styled"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { PrivateSpecQuizItemEssay } from "../../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
-import TextField from "../../../../shared-module/components/InputFields/TextField"
+import { PrivateSpecQuizItemEssay } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
+import TextField from "../../../../../shared-module/components/InputFields/TextField"
 import findQuizItem from "../../utils/general"
 import EditorCard from "../common/EditorCard"
 
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/matrix/TableCellContent.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/matrix/TableCellContent.tsx
similarity index 98%
rename from services/quizzes/src/components/QuizV2/QuizComponents/matrix/TableCellContent.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/matrix/TableCellContent.tsx
index a9c425c6bfd4..9e34a0a5ffbc 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/matrix/TableCellContent.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/matrix/TableCellContent.tsx
@@ -2,7 +2,7 @@ import { css } from "@emotion/css"
 import styled from "@emotion/styled"
 import React, { useState } from "react"
 
-import { baseTheme } from "../../../../shared-module/styles"
+import { baseTheme } from "../../../../../shared-module/styles"
 
 interface CellInputStyleProps {
   row: number
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/matrix/TableContent.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/matrix/TableContent.tsx
similarity index 94%
rename from services/quizzes/src/components/QuizV2/QuizComponents/matrix/TableContent.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/matrix/TableContent.tsx
index 4b6c073964be..4a96053eaee9 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/matrix/TableContent.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/matrix/TableContent.tsx
@@ -1,8 +1,8 @@
 import styled from "@emotion/styled"
 import React, { useEffect, useState } from "react"
 
-import { PrivateSpecQuizItemMatrix } from "../../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
+import { PrivateSpecQuizItemMatrix } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
 import findQuizItem from "../../utils/general"
 
 import TableCellContent from "./TableCellContent"
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/matrix/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/matrix/index.tsx
similarity index 100%
rename from services/quizzes/src/components/QuizV2/QuizComponents/matrix/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/matrix/index.tsx
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/multiple-choice-dropdown/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/multiple-choice-dropdown/index.tsx
similarity index 95%
rename from services/quizzes/src/components/QuizV2/QuizComponents/multiple-choice-dropdown/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/multiple-choice-dropdown/index.tsx
index dbd45b3eafc3..2fc3b84df3e2 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/multiple-choice-dropdown/index.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/multiple-choice-dropdown/index.tsx
@@ -4,14 +4,14 @@ import React, { useState } from "react"
 import { useTranslation } from "react-i18next"
 import { v4 } from "uuid"
 
-import { PrivateSpecQuizItemMultiplechoice } from "../../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
-import Accordion from "../../../../shared-module/components/Accordion"
-import Button from "../../../../shared-module/components/Button"
-import CheckBox from "../../../../shared-module/components/InputFields/CheckBox"
-import RadioButton from "../../../../shared-module/components/InputFields/RadioButton"
-import SelectField from "../../../../shared-module/components/InputFields/SelectField"
-import { primaryFont } from "../../../../shared-module/styles"
+import { PrivateSpecQuizItemMultiplechoice } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
+import Accordion from "../../../../../shared-module/components/Accordion"
+import Button from "../../../../../shared-module/components/Button"
+import CheckBox from "../../../../../shared-module/components/InputFields/CheckBox"
+import RadioButton from "../../../../../shared-module/components/InputFields/RadioButton"
+import SelectField from "../../../../../shared-module/components/InputFields/SelectField"
+import { primaryFont } from "../../../../../shared-module/styles"
 import findQuizItem from "../../utils/general"
 import EditorCard from "../common/EditorCard"
 import MultipleChoiceOption from "../common/MultipleChoiceOption"
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/multiple-choice/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/multiple-choice/index.tsx
similarity index 95%
rename from services/quizzes/src/components/QuizV2/QuizComponents/multiple-choice/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/multiple-choice/index.tsx
index 8b397f3b85cc..d57cd84e34de 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/multiple-choice/index.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/multiple-choice/index.tsx
@@ -4,14 +4,14 @@ import React, { useState } from "react"
 import { useTranslation } from "react-i18next"
 import { v4 } from "uuid"
 
-import { PrivateSpecQuizItemMultiplechoice } from "../../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
-import Accordion from "../../../../shared-module/components/Accordion"
-import Button from "../../../../shared-module/components/Button"
-import CheckBox from "../../../../shared-module/components/InputFields/CheckBox"
-import RadioButton from "../../../../shared-module/components/InputFields/RadioButton"
-import SelectField from "../../../../shared-module/components/InputFields/SelectField"
-import { primaryFont } from "../../../../shared-module/styles"
+import { PrivateSpecQuizItemMultiplechoice } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
+import Accordion from "../../../../../shared-module/components/Accordion"
+import Button from "../../../../../shared-module/components/Button"
+import CheckBox from "../../../../../shared-module/components/InputFields/CheckBox"
+import RadioButton from "../../../../../shared-module/components/InputFields/RadioButton"
+import SelectField from "../../../../../shared-module/components/InputFields/SelectField"
+import { primaryFont } from "../../../../../shared-module/styles"
 import findQuizItem from "../../utils/general"
 import EditorCard from "../common/EditorCard"
 import MultipleChoiceOption from "../common/MultipleChoiceOption"
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/scale/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/scale/index.tsx
similarity index 88%
rename from services/quizzes/src/components/QuizV2/QuizComponents/scale/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/scale/index.tsx
index 5155716b0bc0..5e15136b71cf 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/scale/index.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/scale/index.tsx
@@ -2,9 +2,9 @@ import styled from "@emotion/styled"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { PrivateSpecQuizItemScale } from "../../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
-import TextField from "../../../../shared-module/components/InputFields/TextField"
+import { PrivateSpecQuizItemScale } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
+import TextField from "../../../../../shared-module/components/InputFields/TextField"
 import findQuizItem from "../../utils/general"
 import EditorCard from "../common/EditorCard"
 
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/timeline/TimelineContent.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/timeline/TimelineContent.tsx
similarity index 92%
rename from services/quizzes/src/components/QuizV2/QuizComponents/timeline/TimelineContent.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/timeline/TimelineContent.tsx
index 9a082c861703..720d320f029a 100644
--- a/services/quizzes/src/components/QuizV2/QuizComponents/timeline/TimelineContent.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/timeline/TimelineContent.tsx
@@ -8,11 +8,11 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { v4 } from "uuid"
 
-import { PrivateSpecQuizItemTimeline } from "../../../../../types/quizTypes/privateSpec"
-import { NormalizedQuizItemTimelineItem } from "../../../../../types/types"
-import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
-import TextField from "../../../../shared-module/components/InputFields/TextField"
-import { baseTheme } from "../../../../shared-module/styles"
+import { OldNormalizedQuizItemTimelineItem } from "../../../../../../types/oldQuizTypes"
+import { PrivateSpecQuizItemTimeline } from "../../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../../hooks/useQuizzesExerciseServiceOutputState"
+import TextField from "../../../../../shared-module/components/InputFields/TextField"
+import { baseTheme } from "../../../../../shared-module/styles"
 import findQuizItem from "../../utils/general"
 
 interface TimelineContentProps {
@@ -196,7 +196,7 @@ const TimelineContent: React.FC<React.PropsWithChildren<TimelineContentProps>> =
                         return {
                           ...item,
                           year: isNaN(parsedYear) ? "0" : value,
-                        } as NormalizedQuizItemTimelineItem
+                        } as OldNormalizedQuizItemTimelineItem
                       }
                       return item
                     })
@@ -267,7 +267,7 @@ const TimelineContent: React.FC<React.PropsWithChildren<TimelineContentProps>> =
               correctEventId: v4(),
               year: data.year,
               correctEventName: data.event,
-            } as NormalizedQuizItemTimelineItem)
+            } as OldNormalizedQuizItemTimelineItem)
           })
           reset()
         })}
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/timeline/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/timeline/index.tsx
similarity index 100%
rename from services/quizzes/src/components/QuizV2/QuizComponents/timeline/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/timeline/index.tsx
diff --git a/services/quizzes/src/components/QuizV2/QuizComponents/unsupported/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/unsupported/index.tsx
similarity index 100%
rename from services/quizzes/src/components/QuizV2/QuizComponents/unsupported/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizComponents/unsupported/index.tsx
diff --git a/services/quizzes/src/components/QuizV2/QuizCreation/QuizOption.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizCreation/QuizOption.tsx
similarity index 87%
rename from services/quizzes/src/components/QuizV2/QuizCreation/QuizOption.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizCreation/QuizOption.tsx
index 18087aa20c7a..2570ab10faed 100644
--- a/services/quizzes/src/components/QuizV2/QuizCreation/QuizOption.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizCreation/QuizOption.tsx
@@ -2,9 +2,9 @@ import styled from "@emotion/styled"
 import React from "react"
 import { Trans, useTranslation } from "react-i18next"
 
-import { PrivateSpecQuiz, QuizItemType } from "../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../hooks/useQuizzesExerciseServiceOutputState"
-import { headingFont } from "../../../shared-module/styles"
+import { PrivateSpecQuiz, QuizItemType } from "../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
+import { headingFont } from "../../../../shared-module/styles"
 import { createEmptyQuizItem } from "../utils/general"
 
 export interface QuizOption {
diff --git a/services/quizzes/src/components/QuizV2/QuizCreation/index.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizCreation/index.tsx
similarity index 96%
rename from services/quizzes/src/components/QuizV2/QuizCreation/index.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizCreation/index.tsx
index a245f12f7828..dd65acdcce61 100644
--- a/services/quizzes/src/components/QuizV2/QuizCreation/index.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/QuizCreation/index.tsx
@@ -4,9 +4,9 @@ import React, { useMemo } from "react"
 import { useTranslation } from "react-i18next"
 import { v4 } from "uuid"
 
-import { PrivateSpecQuiz } from "../../../../types/quizTypes/privateSpec"
-import useQuizzesExerciseServiceOutputState from "../../../hooks/useQuizzesExerciseServiceOutputState"
-import Button from "../../../shared-module/components/Button"
+import { PrivateSpecQuiz } from "../../../../../types/quizTypes/privateSpec"
+import useQuizzesExerciseServiceOutputState from "../../../../hooks/useQuizzesExerciseServiceOutputState"
+import Button from "../../../../shared-module/components/Button"
 import QuizEditor from "../QuizComponents/QuizEditor"
 import { createEmptyQuizItem } from "../utils/general"
 
diff --git a/services/quizzes/src/components/ExerciseEditor.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/index.tsx
similarity index 71%
rename from services/quizzes/src/components/ExerciseEditor.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/index.tsx
index 3a402ad1da99..0e02a19463bb 100644
--- a/services/quizzes/src/components/ExerciseEditor.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/index.tsx
@@ -1,10 +1,10 @@
 import React, { useState } from "react"
 
-import { PrivateSpecQuiz } from "../../types/quizTypes/privateSpec"
-import QuizzesExerciseServiceContext from "../contexts/QuizzesExerciseServiceContext"
+import { PrivateSpecQuiz } from "../../../../types/quizTypes/privateSpec"
+import QuizzesExerciseServiceContext from "../../../contexts/QuizzesExerciseServiceContext"
 
-import QuizCommonInfo from "./QuizV2/QuizCommonInfo"
-import QuizItemsV2 from "./QuizV2/QuizCreation"
+import QuizCommonInfo from "./QuizCommonInfo"
+import QuizItemsV2 from "./QuizCreation"
 
 export interface EditorProps {
   port: MessagePort
diff --git a/services/quizzes/src/components/QuizV2/utils/general.tsx b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/utils/general.tsx
similarity index 98%
rename from services/quizzes/src/components/QuizV2/utils/general.tsx
rename to services/quizzes/src/components/exercise-service-views/ExerciseEditor/utils/general.tsx
index ea70dc33ea50..997338c5e9cb 100644
--- a/services/quizzes/src/components/QuizV2/utils/general.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ExerciseEditor/utils/general.tsx
@@ -12,7 +12,7 @@ import {
   PrivateSpecQuizItemScale,
   PrivateSpecQuizItemTimeline,
   QuizItemType,
-} from "../../../../types/quizTypes/privateSpec"
+} from "../../../../../types/quizTypes/privateSpec"
 
 /**
  * Find quiz item from quiz
diff --git a/services/quizzes/src/components/Renderer.tsx b/services/quizzes/src/components/exercise-service-views/Renderer.tsx
similarity index 86%
rename from services/quizzes/src/components/Renderer.tsx
rename to services/quizzes/src/components/exercise-service-views/Renderer.tsx
index 89b988e56fe6..4e479cece762 100644
--- a/services/quizzes/src/components/Renderer.tsx
+++ b/services/quizzes/src/components/exercise-service-views/Renderer.tsx
@@ -2,12 +2,11 @@ import dynamic from "next/dynamic"
 import React, { Dispatch, SetStateAction } from "react"
 import { useTranslation } from "react-i18next"
 
-import { State } from "../pages/iframe"
-import { EXERCISE_SERVICE_CONTENT_ID } from "../shared-module/utils/constants"
-import withErrorBoundary from "../shared-module/utils/withErrorBoundary"
-import withNoSsr from "../shared-module/utils/withNoSsr"
-
-import DynamicallyLoadingComponentPlaceholder from "./ComponentPlaceholder"
+import { State } from "../../pages/iframe"
+import { EXERCISE_SERVICE_CONTENT_ID } from "../../shared-module/utils/constants"
+import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
+import withNoSsr from "../../shared-module/utils/withNoSsr"
+import DynamicallyLoadingComponentPlaceholder from "../ComponentPlaceholder"
 
 // Dynamic imports for different view types to keep the bundle size down
 const ExerciseEditor = dynamic(() => import("./ExerciseEditor"), {
diff --git a/services/quizzes/src/components/SubmissionComponents/Checkbox.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Checkbox.tsx
similarity index 87%
rename from services/quizzes/src/components/SubmissionComponents/Checkbox.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Checkbox.tsx
index 5fbe1e8e83fe..83638102d3e9 100644
--- a/services/quizzes/src/components/SubmissionComponents/Checkbox.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Checkbox.tsx
@@ -2,10 +2,10 @@ import { css } from "@emotion/css"
 import styled from "@emotion/styled"
 import React from "react"
 
-import { UserItemAnswerCheckbox } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemCheckbox } from "../../../types/quizTypes/publicSpec"
-import { baseTheme } from "../../shared-module/styles"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
+import { UserItemAnswerCheckbox } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemCheckbox } from "../../../../../types/quizTypes/publicSpec"
+import { baseTheme } from "../../../../shared-module/styles"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/SubmissionComponents/ChooseN.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/ChooseN.tsx
similarity index 80%
rename from services/quizzes/src/components/SubmissionComponents/ChooseN.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/ChooseN.tsx
index 0b4c0aa7082d..693a752a4e17 100644
--- a/services/quizzes/src/components/SubmissionComponents/ChooseN.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/ChooseN.tsx
@@ -1,12 +1,12 @@
 import { css } from "@emotion/css"
 import React from "react"
 
-import { UserItemAnswerChooseN } from "../../../types/quizTypes/answer"
-import { ModelSolutionQuizItemChooseN } from "../../../types/quizTypes/modelSolutionSpec"
-import { PublicSpecQuizItemChooseN } from "../../../types/quizTypes/publicSpec"
-import { respondToOrLarger } from "../../shared-module/styles/respond"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import { quizTheme } from "../../styles/QuizStyles"
+import { UserItemAnswerChooseN } from "../../../../../types/quizTypes/answer"
+import { ModelSolutionQuizItemChooseN } from "../../../../../types/quizTypes/modelSolutionSpec"
+import { PublicSpecQuizItemChooseN } from "../../../../../types/quizTypes/publicSpec"
+import { respondToOrLarger } from "../../../../shared-module/styles/respond"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import { quizTheme } from "../../../../styles/QuizStyles"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/SubmissionComponents/Closed-ended-question.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Closed-ended-question.tsx
similarity index 82%
rename from services/quizzes/src/components/SubmissionComponents/Closed-ended-question.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Closed-ended-question.tsx
index 2ed984f97a14..e08a8256afa8 100644
--- a/services/quizzes/src/components/SubmissionComponents/Closed-ended-question.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Closed-ended-question.tsx
@@ -2,13 +2,13 @@ import { css, cx } from "@emotion/css"
 import React, { useId } from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswerClosedEndedQuestion } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemClosedEndedQuestion } from "../../../types/quizTypes/publicSpec"
-import TextField from "../../shared-module/components/InputFields/TextField"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import { quizTheme } from "../../styles/QuizStyles"
-import MarkdownText from "../MarkdownText"
-import CloseEndedQuestionWrapper from "../Shared/CloseEndedQuestionWrapper"
+import { UserItemAnswerClosedEndedQuestion } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemClosedEndedQuestion } from "../../../../../types/quizTypes/publicSpec"
+import TextField from "../../../../shared-module/components/InputFields/TextField"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import { quizTheme } from "../../../../styles/QuizStyles"
+import MarkdownText from "../../../MarkdownText"
+import CloseEndedQuestionWrapper from "../../../Shared/CloseEndedQuestionWrapper"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/SubmissionComponents/Essay.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Essay.tsx
similarity index 80%
rename from services/quizzes/src/components/SubmissionComponents/Essay.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Essay.tsx
index ed5c58fc5df3..edf3767be818 100644
--- a/services/quizzes/src/components/SubmissionComponents/Essay.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Essay.tsx
@@ -2,11 +2,11 @@ import { css } from "@emotion/css"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswerEssay } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemEssay } from "../../../types/quizTypes/publicSpec"
-import { baseTheme } from "../../shared-module/styles"
-import { wordCount } from "../../shared-module/utils/strings"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
+import { UserItemAnswerEssay } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemEssay } from "../../../../../types/quizTypes/publicSpec"
+import { baseTheme } from "../../../../shared-module/styles"
+import { wordCount } from "../../../../shared-module/utils/strings"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/SubmissionComponents/Matrix.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Matrix.tsx
similarity index 94%
rename from services/quizzes/src/components/SubmissionComponents/Matrix.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Matrix.tsx
index 2520a28f75ad..8845e03992db 100644
--- a/services/quizzes/src/components/SubmissionComponents/Matrix.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Matrix.tsx
@@ -4,10 +4,10 @@ import { faCheckCircle, faTimesCircle } from "@fortawesome/free-solid-svg-icons"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import React from "react"
 
-import { UserItemAnswerMatrix } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemMatrix } from "../../../types/quizTypes/publicSpec"
-import { baseTheme } from "../../shared-module/styles"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
+import { UserItemAnswerMatrix } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemMatrix } from "../../../../../types/quizTypes/publicSpec"
+import { baseTheme } from "../../../../shared-module/styles"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/SubmissionComponents/MultipleChoice.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/MultipleChoice.tsx
similarity index 89%
rename from services/quizzes/src/components/SubmissionComponents/MultipleChoice.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/MultipleChoice.tsx
index 4033b0978676..d7e1f09f4469 100644
--- a/services/quizzes/src/components/SubmissionComponents/MultipleChoice.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/MultipleChoice.tsx
@@ -2,16 +2,16 @@ import { css, cx } from "@emotion/css"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswerMultiplechoice } from "../../../types/quizTypes/answer"
-import { ModelSolutionQuizItemMultiplechoice } from "../../../types/quizTypes/modelSolutionSpec"
-import { PublicSpecQuizItemMultiplechoice } from "../../../types/quizTypes/publicSpec"
-import { respondToOrLarger } from "../../shared-module/styles/respond"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import { quizTheme } from "../../styles/QuizStyles"
-import { FlexDirection, sanitizeFlexDirection } from "../../util/css-sanitization"
-import { orderArrayWithId } from "../../util/randomizer"
-import MarkdownText from "../MarkdownText"
-import ParsedText from "../ParsedText"
+import { UserItemAnswerMultiplechoice } from "../../../../../types/quizTypes/answer"
+import { ModelSolutionQuizItemMultiplechoice } from "../../../../../types/quizTypes/modelSolutionSpec"
+import { PublicSpecQuizItemMultiplechoice } from "../../../../../types/quizTypes/publicSpec"
+import { respondToOrLarger } from "../../../../shared-module/styles/respond"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import { quizTheme } from "../../../../styles/QuizStyles"
+import { FlexDirection, sanitizeFlexDirection } from "../../../../util/css-sanitization"
+import { orderArrayWithId } from "../../../../util/randomizer"
+import MarkdownText from "../../../MarkdownText"
+import ParsedText from "../../../ParsedText"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/SubmissionComponents/MultipleChoiceDropdown.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/MultipleChoiceDropdown.tsx
similarity index 92%
rename from services/quizzes/src/components/SubmissionComponents/MultipleChoiceDropdown.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/MultipleChoiceDropdown.tsx
index 57241153309f..bf2fc15a7eb4 100644
--- a/services/quizzes/src/components/SubmissionComponents/MultipleChoiceDropdown.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/MultipleChoiceDropdown.tsx
@@ -2,12 +2,12 @@ import { css } from "@emotion/css"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswerMultiplechoiceDropdown } from "../../../types/quizTypes/answer"
-import { ModelSolutionQuizItemMultiplechoiceDropdown } from "../../../types/quizTypes/modelSolutionSpec"
-import { PublicSpecQuizItemMultiplechoiceDropdown } from "../../../types/quizTypes/publicSpec"
-import { respondToOrLarger } from "../../shared-module/styles/respond"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import { quizTheme } from "../../styles/QuizStyles"
+import { UserItemAnswerMultiplechoiceDropdown } from "../../../../../types/quizTypes/answer"
+import { ModelSolutionQuizItemMultiplechoiceDropdown } from "../../../../../types/quizTypes/modelSolutionSpec"
+import { PublicSpecQuizItemMultiplechoiceDropdown } from "../../../../../types/quizTypes/publicSpec"
+import { respondToOrLarger } from "../../../../shared-module/styles/respond"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import { quizTheme } from "../../../../styles/QuizStyles"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/SubmissionComponents/Scale.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Scale.tsx
similarity index 84%
rename from services/quizzes/src/components/SubmissionComponents/Scale.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Scale.tsx
index e97cb26a2fae..b64ab862bc42 100644
--- a/services/quizzes/src/components/SubmissionComponents/Scale.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Scale.tsx
@@ -1,12 +1,12 @@
 import { css } from "@emotion/css"
 import React, { useId } from "react"
 
-import { UserItemAnswerScale } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItemScale } from "../../../types/quizTypes/publicSpec"
-import { primaryFont } from "../../shared-module/styles"
-import { respondToOrLarger } from "../../shared-module/styles/respond"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
-import MarkdownText from "../MarkdownText"
+import { UserItemAnswerScale } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItemScale } from "../../../../../types/quizTypes/publicSpec"
+import { primaryFont } from "../../../../shared-module/styles"
+import { respondToOrLarger } from "../../../../shared-module/styles/respond"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
+import MarkdownText from "../../../MarkdownText"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/SubmissionComponents/Timeline.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Timeline.tsx
similarity index 94%
rename from services/quizzes/src/components/SubmissionComponents/Timeline.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Timeline.tsx
index 07b56890890a..478d35fc92af 100644
--- a/services/quizzes/src/components/SubmissionComponents/Timeline.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Timeline.tsx
@@ -5,11 +5,11 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswerTimeline } from "../../../types/quizTypes/answer"
-import { ModelSolutionQuizItemTimeline } from "../../../types/quizTypes/modelSolutionSpec"
-import { PublicSpecQuizItemTimeline } from "../../../types/quizTypes/publicSpec"
-import { baseTheme, headingFont } from "../../shared-module/styles"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
+import { UserItemAnswerTimeline } from "../../../../../types/quizTypes/answer"
+import { ModelSolutionQuizItemTimeline } from "../../../../../types/quizTypes/modelSolutionSpec"
+import { PublicSpecQuizItemTimeline } from "../../../../../types/quizTypes/publicSpec"
+import { baseTheme, headingFont } from "../../../../shared-module/styles"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/SubmissionComponents/Unsupported.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Unsupported.tsx
similarity index 63%
rename from services/quizzes/src/components/SubmissionComponents/Unsupported.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Unsupported.tsx
index 26a42f8b9c61..e29982e0605b 100644
--- a/services/quizzes/src/components/SubmissionComponents/Unsupported.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/Unsupported.tsx
@@ -1,9 +1,9 @@
 import React from "react"
 import { useTranslation } from "react-i18next"
 
-import { UserItemAnswer } from "../../../types/quizTypes/answer"
-import { PublicSpecQuizItem } from "../../../types/quizTypes/publicSpec"
-import withErrorBoundary from "../../shared-module/utils/withErrorBoundary"
+import { UserItemAnswer } from "../../../../../types/quizTypes/answer"
+import { PublicSpecQuizItem } from "../../../../../types/quizTypes/publicSpec"
+import withErrorBoundary from "../../../../shared-module/utils/withErrorBoundary"
 
 import { QuizItemSubmissionComponentProps } from "."
 
diff --git a/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/index.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/index.tsx
new file mode 100644
index 000000000000..5f8ea28650df
--- /dev/null
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/impl-by-quiz-item-type/index.tsx
@@ -0,0 +1,18 @@
+import { UserItemAnswer } from "../../../../../types/quizTypes/answer"
+import { ModelSolutionQuizItem } from "../../../../../types/quizTypes/modelSolutionSpec"
+import { PublicSpecQuizItem } from "../../../../../types/quizTypes/publicSpec"
+import { ItemAnswerFeedback } from "../../../../grading/feedback"
+import { UserInformation } from "../../../../shared-module/exercise-service-protocol-types"
+import { FlexDirection } from "../../../../util/css-sanitization"
+
+export interface QuizItemSubmissionComponentProps<
+  T extends PublicSpecQuizItem,
+  K extends UserItemAnswer,
+> {
+  public_quiz_item: T
+  quiz_direction: FlexDirection
+  quiz_item_model_solution: ModelSolutionQuizItem | null
+  quiz_item_feedback: ItemAnswerFeedback | null
+  user_quiz_item_answer: K
+  user_information: UserInformation
+}
diff --git a/services/quizzes/src/components/ViewSubmission.tsx b/services/quizzes/src/components/exercise-service-views/ViewSubmission/index.tsx
similarity index 90%
rename from services/quizzes/src/components/ViewSubmission.tsx
rename to services/quizzes/src/components/exercise-service-views/ViewSubmission/index.tsx
index 559cca9c938c..0dbbbd2541e9 100644
--- a/services/quizzes/src/components/ViewSubmission.tsx
+++ b/services/quizzes/src/components/exercise-service-views/ViewSubmission/index.tsx
@@ -14,9 +14,9 @@ import {
   UserItemAnswerMultiplechoiceDropdown,
   UserItemAnswerScale,
   UserItemAnswerTimeline,
-} from "../../types/quizTypes/answer"
-import { ModelSolutionQuiz } from "../../types/quizTypes/modelSolutionSpec"
-import { QuizItemType } from "../../types/quizTypes/privateSpec"
+} from "../../../../types/quizTypes/answer"
+import { ModelSolutionQuiz } from "../../../../types/quizTypes/modelSolutionSpec"
+import { QuizItemType } from "../../../../types/quizTypes/privateSpec"
 import {
   PublicSpecQuiz,
   PublicSpecQuizItemCheckbox,
@@ -28,24 +28,24 @@ import {
   PublicSpecQuizItemMultiplechoiceDropdown,
   PublicSpecQuizItemScale,
   PublicSpecQuizItemTimeline,
-} from "../../types/quizTypes/publicSpec"
-import { ItemAnswerFeedback } from "../grading/feedback"
-import { UserInformation } from "../shared-module/exercise-service-protocol-types"
-import { baseTheme } from "../shared-module/styles"
-import { COLUMN } from "../util/constants"
-import { FlexDirection, sanitizeFlexDirection } from "../util/css-sanitization"
+} from "../../../../types/quizTypes/publicSpec"
+import { ItemAnswerFeedback } from "../../../grading/feedback"
+import { UserInformation } from "../../../shared-module/exercise-service-protocol-types"
+import { baseTheme } from "../../../shared-module/styles"
+import { COLUMN } from "../../../util/constants"
+import { FlexDirection, sanitizeFlexDirection } from "../../../util/css-sanitization"
+import FlexWrapper from "../../FlexWrapper"
 
-import FlexWrapper from "./FlexWrapper"
-import CheckBoxFeedback from "./SubmissionComponents/Checkbox"
-import ChooseN from "./SubmissionComponents/ChooseN"
-import ClosedEndedQuestionFeedback from "./SubmissionComponents/Closed-ended-question"
-import EssayFeedback from "./SubmissionComponents/Essay"
-import MatrixSubmission from "./SubmissionComponents/Matrix"
-import MultipleChoiceSubmission from "./SubmissionComponents/MultipleChoice"
-import MultipleChoiceDropdownFeedback from "./SubmissionComponents/MultipleChoiceDropdown"
-import ScaleSubmissionViewComponent from "./SubmissionComponents/Scale"
-import Timeline from "./SubmissionComponents/Timeline"
-import Unsupported from "./SubmissionComponents/Unsupported"
+import CheckBoxFeedback from "./impl-by-quiz-item-type/Checkbox"
+import ChooseN from "./impl-by-quiz-item-type/ChooseN"
+import ClosedEndedQuestionFeedback from "./impl-by-quiz-item-type/Closed-ended-question"
+import EssayFeedback from "./impl-by-quiz-item-type/Essay"
+import MatrixSubmission from "./impl-by-quiz-item-type/Matrix"
+import MultipleChoiceSubmission from "./impl-by-quiz-item-type/MultipleChoice"
+import MultipleChoiceDropdownFeedback from "./impl-by-quiz-item-type/MultipleChoiceDropdown"
+import ScaleSubmissionViewComponent from "./impl-by-quiz-item-type/Scale"
+import Timeline from "./impl-by-quiz-item-type/Timeline"
+import Unsupported from "./impl-by-quiz-item-type/Unsupported"
 
 interface SubmissionProps {
   user_answer: UserAnswer
diff --git a/services/quizzes/src/grading/utils.ts b/services/quizzes/src/grading/utils.ts
index e3b6ebae3942..9f6b66ce166d 100644
--- a/services/quizzes/src/grading/utils.ts
+++ b/services/quizzes/src/grading/utils.ts
@@ -1,24 +1,24 @@
+import { OldQuiz, OldQuizAnswer } from "../../types/oldQuizTypes"
 import { UserAnswer } from "../../types/quizTypes/answer"
 import { PrivateSpecQuiz } from "../../types/quizTypes/privateSpec"
-import { Quiz, QuizAnswer } from "../../types/types"
 import { isOldQuiz, isOldUserAnswer } from "../util/migration/migrationSettings"
 import { migratePrivateSpecQuiz } from "../util/migration/privateSpecQuiz"
 import migrateQuizAnswer from "../util/migration/userAnswerSpec"
 
-const handlePrivateSpecMigration = (quiz: PrivateSpecQuiz | Quiz): PrivateSpecQuiz => {
+const handlePrivateSpecMigration = (quiz: PrivateSpecQuiz | OldQuiz): PrivateSpecQuiz => {
   if (isOldQuiz(quiz)) {
-    return migratePrivateSpecQuiz(quiz as Quiz)
+    return migratePrivateSpecQuiz(quiz as OldQuiz)
   }
   return quiz as PrivateSpecQuiz
 }
 
 const handleUserAnswerMigration = (
   privateSpecQuiz: PrivateSpecQuiz,
-  quizAnswer: UserAnswer | QuizAnswer,
+  quizAnswer: UserAnswer | OldQuizAnswer,
 ): UserAnswer => {
   if (isOldUserAnswer(quizAnswer)) {
     return (
-      migrateQuizAnswer(quizAnswer as QuizAnswer, privateSpecQuiz) ?? (quizAnswer as UserAnswer)
+      migrateQuizAnswer(quizAnswer as OldQuizAnswer, privateSpecQuiz) ?? (quizAnswer as UserAnswer)
     )
   }
   return quizAnswer as UserAnswer
diff --git a/services/quizzes/src/pages/api/model-solution.ts b/services/quizzes/src/pages/api/model-solution.ts
index 71bdf38d60b2..d9792b268d35 100644
--- a/services/quizzes/src/pages/api/model-solution.ts
+++ b/services/quizzes/src/pages/api/model-solution.ts
@@ -1,8 +1,8 @@
 /* eslint-disable i18next/no-literal-string */
 import { NextApiRequest, NextApiResponse } from "next"
 
+import { OldQuiz } from "../../../types/oldQuizTypes"
 import { ModelSolutionQuiz } from "../../../types/quizTypes/modelSolutionSpec"
-import { Quiz } from "../../../types/types"
 import { isSpecRequest } from "../../shared-module/bindings.guard"
 import { isOldQuiz } from "../../util/migration/migrationSettings"
 import migrateModelSolutionSpecQuiz from "../../util/migration/modelSolutionSpecQuiz"
@@ -30,7 +30,7 @@ function handleModelSolutionGeneration(
     throw new Error("Request was not valid.")
   }
   const specRequest = req.body
-  const quiz = specRequest.private_spec as Quiz | null
+  const quiz = specRequest.private_spec as OldQuiz | null
   if (quiz === null) {
     throw "Private spec cannot be null"
   }
@@ -39,10 +39,10 @@ function handleModelSolutionGeneration(
   return res.status(200).json(modelSolution)
 }
 
-function createModelSolution(quiz: Quiz | ModelSolutionQuiz): ModelSolutionQuiz {
+function createModelSolution(quiz: OldQuiz | ModelSolutionQuiz): ModelSolutionQuiz {
   let modelSolution: ModelSolutionQuiz | null = null
   if (isOldQuiz(quiz)) {
-    modelSolution = migrateModelSolutionSpecQuiz(quiz as Quiz)
+    modelSolution = migrateModelSolutionSpecQuiz(quiz as OldQuiz)
   } else {
     modelSolution = quiz as ModelSolutionQuiz
   }
diff --git a/services/quizzes/src/pages/api/public-spec.ts b/services/quizzes/src/pages/api/public-spec.ts
index 3e69308a5e24..ceb7bc89ed2e 100644
--- a/services/quizzes/src/pages/api/public-spec.ts
+++ b/services/quizzes/src/pages/api/public-spec.ts
@@ -1,8 +1,8 @@
 /* eslint-disable i18next/no-literal-string */
 import { NextApiRequest, NextApiResponse } from "next"
 
+import { OldQuiz } from "../../../types/oldQuizTypes"
 import { PrivateSpecQuiz } from "../../../types/quizTypes/privateSpec"
-import { Quiz } from "../../../types/types"
 import { isSpecRequest } from "../../shared-module/bindings.guard"
 import { convertPublicSpecFromPrivateSpec } from "../../util/converter"
 import { isOldQuiz } from "../../util/migration/migrationSettings"
@@ -32,13 +32,13 @@ function handlePost(req: NextApiRequest, res: NextApiResponse) {
     throw new Error("Invalid request")
   }
   const specRequest = req.body
-  const quiz = specRequest.private_spec as Quiz | PrivateSpecQuiz | null
+  const quiz = specRequest.private_spec as OldQuiz | PrivateSpecQuiz | null
   if (quiz === null) {
     throw "Quiz cannot be null"
   }
   let converted: PrivateSpecQuiz | null = null
   if (isOldQuiz(quiz)) {
-    converted = migratePrivateSpecQuiz(quiz as Quiz)
+    converted = migratePrivateSpecQuiz(quiz as OldQuiz)
   } else {
     converted = quiz as PrivateSpecQuiz
   }
diff --git a/services/quizzes/src/pages/iframe.tsx b/services/quizzes/src/pages/iframe.tsx
index a3a2fa654697..b04e18b7cde1 100644
--- a/services/quizzes/src/pages/iframe.tsx
+++ b/services/quizzes/src/pages/iframe.tsx
@@ -4,17 +4,17 @@ import React, { useState } from "react"
 import ReactDOM from "react-dom"
 import { useTranslation } from "react-i18next"
 
+import {
+  OldModelSolutionQuiz as oldModelSolutionQuiz,
+  OldPublicQuiz,
+  OldQuiz,
+  OldQuizAnswer,
+} from "../../types/oldQuizTypes"
 import { UserAnswer } from "../../types/quizTypes/answer"
 import { ModelSolutionQuiz } from "../../types/quizTypes/modelSolutionSpec"
 import { PrivateSpecQuiz } from "../../types/quizTypes/privateSpec"
 import { PublicSpecQuiz } from "../../types/quizTypes/publicSpec"
-import {
-  ModelSolutionQuiz as oldModelSolutionQuiz,
-  PublicQuiz,
-  Quiz,
-  QuizAnswer,
-} from "../../types/types"
-import Renderer from "../components/Renderer"
+import Renderer from "../components/exercise-service-views/Renderer"
 import { ItemAnswerFeedback } from "../grading/feedback"
 import { StudentExerciseTaskSubmissionResult } from "../shared-module/bindings"
 import HeightTrackingContainer from "../shared-module/components/HeightTrackingContainer"
@@ -39,7 +39,7 @@ import migrateQuizAnswer from "../util/migration/userAnswerSpec"
 
 export interface SubmissionData {
   submission_result: StudentExerciseTaskSubmissionResult
-  user_answer: QuizAnswer
+  user_answer: OldQuizAnswer
   public_spec: unknown
 }
 
@@ -81,15 +81,15 @@ const IFrame: React.FC<React.PropsWithChildren<unknown>> = () => {
           }
           let public_spec = messageData.data.public_spec
           let quiz_answer = messageData.data.previous_submission
-          if (isOldQuiz(messageData.data.previous_submission as QuizAnswer)) {
+          if (isOldQuiz(messageData.data.previous_submission as OldQuizAnswer)) {
             quiz_answer = migrateQuizAnswer(
               // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              (messageData.data.previous_submission as any)?.private_spec as QuizAnswer,
+              (messageData.data.previous_submission as any)?.private_spec as OldQuizAnswer,
               public_spec as PublicSpecQuiz,
             )
           }
-          if (isOldQuiz(public_spec as PublicQuiz)) {
-            public_spec = migratePublicSpecQuiz(public_spec as PublicQuiz)
+          if (isOldQuiz(public_spec as OldPublicQuiz)) {
+            public_spec = migratePublicSpecQuiz(public_spec as OldPublicQuiz)
           }
           setState({
             viewType: messageData.view_type,
@@ -126,7 +126,7 @@ const IFrame: React.FC<React.PropsWithChildren<unknown>> = () => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             if (isOldQuiz(converted as any)) {
               converted = migrateQuiz(converted)
-              converted = migratePrivateSpecQuiz(converted as Quiz)
+              converted = migratePrivateSpecQuiz(converted as OldQuiz)
             }
 
             if (converted === null || converted === undefined) {
@@ -158,18 +158,18 @@ const IFrame: React.FC<React.PropsWithChildren<unknown>> = () => {
           let public_spec = messageData.data.public_spec
           let model_solution_spec = messageData.data.model_solution_spec
           let quiz_answer = messageData.data.user_answer
-          if (isOldQuiz(public_spec as PublicQuiz)) {
-            public_spec = migratePublicSpecQuiz(public_spec as PublicQuiz)
+          if (isOldQuiz(public_spec as OldPublicQuiz)) {
+            public_spec = migratePublicSpecQuiz(public_spec as OldPublicQuiz)
           }
-          if (isOldQuiz(model_solution_spec as PublicQuiz)) {
+          if (isOldQuiz(model_solution_spec as OldPublicQuiz)) {
             model_solution_spec = migrateModelSolutionSpecQuiz(
               model_solution_spec as oldModelSolutionQuiz,
             )
           }
-          if (isOldQuiz(messageData.data.user_answer as QuizAnswer)) {
+          if (isOldQuiz(messageData.data.user_answer as OldQuizAnswer)) {
             quiz_answer = migrateQuizAnswer(
               // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              messageData.data.user_answer as any as QuizAnswer,
+              messageData.data.user_answer as any as OldQuizAnswer,
               public_spec as PublicSpecQuiz,
             )
           }
diff --git a/services/quizzes/src/util/migrate.ts b/services/quizzes/src/util/migrate.ts
index 0cb6fb99b24a..d6e85f1cc786 100644
--- a/services/quizzes/src/util/migrate.ts
+++ b/services/quizzes/src/util/migrate.ts
@@ -1,13 +1,13 @@
 // Allow any for this file, because we are checking for properties that no longer exist in interfaces.
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Quiz, QuizItem, QuizItemOption } from "../../types/types"
+import { OldQuiz, OldQuizItemOption, QuizItem } from "../../types/oldQuizTypes"
 
-export function migrateQuiz(oldQuiz: unknown): Quiz {
+export function migrateQuiz(oldQuiz: unknown): OldQuiz {
   console.log("Old quiz:", oldQuiz)
   return {
-    ...(oldQuiz as Quiz),
-    items: (oldQuiz as Quiz).items.map((x) => migrateQuizItem(x)),
+    ...(oldQuiz as OldQuiz),
+    items: (oldQuiz as OldQuiz).items.map((x) => migrateQuizItem(x)),
   }
 }
 
@@ -18,30 +18,31 @@ function migrateQuizItem(oldQuizItem: unknown): QuizItem {
   }
 }
 
-function migrateQuizItemOption(oldQuizItemOption: unknown): QuizItemOption {
+function migrateQuizItemOption(oldQuizItemOption: unknown): OldQuizItemOption {
   const successMessage: string | null = (oldQuizItemOption as any).successMessage
   const failureMessage: string | null = (oldQuizItemOption as any).failureMessage
   if (successMessage === null && failureMessage === null) {
     // Nothing to migrate, avoid overriding existing feedback message.
-    return oldQuizItemOption as QuizItemOption
+    return oldQuizItemOption as OldQuizItemOption
   }
   let feedback
-  if ((oldQuizItemOption as QuizItemOption).messageAfterSubmissionWhenSelected) {
-    feedback = (oldQuizItemOption as QuizItemOption).messageAfterSubmissionWhenSelected
+  if ((oldQuizItemOption as OldQuizItemOption).messageAfterSubmissionWhenSelected) {
+    feedback = (oldQuizItemOption as OldQuizItemOption).messageAfterSubmissionWhenSelected
   } else {
-    feedback = (oldQuizItemOption as QuizItemOption).correct ? successMessage : failureMessage
+    feedback = (oldQuizItemOption as OldQuizItemOption).correct ? successMessage : failureMessage
   }
   return {
-    id: (oldQuizItemOption as QuizItemOption).id,
-    body: (oldQuizItemOption as QuizItemOption).body,
-    correct: (oldQuizItemOption as QuizItemOption).correct,
-    createdAt: (oldQuizItemOption as QuizItemOption).createdAt,
+    id: (oldQuizItemOption as OldQuizItemOption).id,
+    body: (oldQuizItemOption as OldQuizItemOption).body,
+    correct: (oldQuizItemOption as OldQuizItemOption).correct,
+    createdAt: (oldQuizItemOption as OldQuizItemOption).createdAt,
     messageAfterSubmissionWhenSelected: feedback,
     additionalCorrectnessExplanationOnModelSolution:
-      (oldQuizItemOption as QuizItemOption).additionalCorrectnessExplanationOnModelSolution ?? null,
-    order: (oldQuizItemOption as QuizItemOption).order,
-    title: (oldQuizItemOption as QuizItemOption).title,
-    updatedAt: (oldQuizItemOption as QuizItemOption).updatedAt,
-    quizItemId: (oldQuizItemOption as QuizItemOption).quizItemId,
+      (oldQuizItemOption as OldQuizItemOption).additionalCorrectnessExplanationOnModelSolution ??
+      null,
+    order: (oldQuizItemOption as OldQuizItemOption).order,
+    title: (oldQuizItemOption as OldQuizItemOption).title,
+    updatedAt: (oldQuizItemOption as OldQuizItemOption).updatedAt,
+    quizItemId: (oldQuizItemOption as OldQuizItemOption).quizItemId,
   }
 }
diff --git a/services/quizzes/src/util/migration/migrationSettings.ts b/services/quizzes/src/util/migration/migrationSettings.ts
index 0763a1943dcb..61b0a34d4751 100644
--- a/services/quizzes/src/util/migration/migrationSettings.ts
+++ b/services/quizzes/src/util/migration/migrationSettings.ts
@@ -1,10 +1,15 @@
 // Default value for choose-n exercise
 
+import {
+  OldPublicQuiz,
+  OldQuiz,
+  OldQuizAnswer,
+  OldQuizItemAnswer,
+} from "../../../types/oldQuizTypes"
 import { UserAnswer } from "../../../types/quizTypes/answer"
 import { ModelSolutionQuiz } from "../../../types/quizTypes/modelSolutionSpec"
 import { PrivateSpecQuiz } from "../../../types/quizTypes/privateSpec"
 import { PublicSpecQuiz } from "../../../types/quizTypes/publicSpec"
-import { PublicQuiz, Quiz, QuizAnswer, QuizItemAnswer } from "../../../types/types"
 
 // Not set in the previous version
 const DEFAULT_N = 10
@@ -13,7 +18,7 @@ const DEFAULT_N = 10
  * Check if the quiz version is old.
  *
  * @param quiz Quiz
- * @see Quiz
+ * @see OldQuiz
  * @see PrivateSpecQuiz
  * @see PublicSpecQuiz
  * @see ModelSolutionQuiz
@@ -21,14 +26,14 @@ const DEFAULT_N = 10
  */
 const isOldQuiz = (
   quiz:
-    | Quiz
-    | PublicQuiz
+    | OldQuiz
+    | OldPublicQuiz
     | ModelSolutionQuiz
     | PrivateSpecQuiz
     | PublicSpecQuiz
     | ModelSolutionQuiz
-    | QuizItemAnswer
-    | QuizAnswer
+    | OldQuizItemAnswer
+    | OldQuizAnswer
     | null
     | undefined,
 ): boolean => {
@@ -39,7 +44,7 @@ const isOldQuiz = (
   return !Object.prototype.hasOwnProperty.call(quiz, "version")
 }
 
-const isOldUserAnswer = (userAnswer: UserAnswer | QuizAnswer): boolean => {
+const isOldUserAnswer = (userAnswer: UserAnswer | OldQuizAnswer): boolean => {
   if (!userAnswer) {
     return false
   }
diff --git a/services/quizzes/src/util/migration/modelSolutionSpecQuiz.ts b/services/quizzes/src/util/migration/modelSolutionSpecQuiz.ts
index 385d88d979bc..fb4dce85c1dc 100644
--- a/services/quizzes/src/util/migration/modelSolutionSpecQuiz.ts
+++ b/services/quizzes/src/util/migration/modelSolutionSpecQuiz.ts
@@ -1,3 +1,7 @@
+import {
+  OldModelSolutionQuiz as OldModelSolutionQuiz,
+  OldModelSolutionQuizItem as OldModelSolutionQuizItem,
+} from "../../../types/oldQuizTypes"
 import {
   ModelSolutionQuiz,
   ModelSolutionQuizItem,
@@ -10,12 +14,8 @@ import {
   ModelSolutionQuizItemMultiplechoiceDropdown,
   ModelSolutionQuizItemScale,
   ModelSolutionQuizItemTimeline,
-  OldQuizItemType,
 } from "../../../types/quizTypes/modelSolutionSpec"
-import {
-  ModelSolutionQuiz as OldModelSolutionQuiz,
-  ModelSolutionQuizItem as OldModelSolutionQuizItem,
-} from "../../../types/types"
+import { OldQuizItemType } from "../../../types/quizTypes/oldQuizTypes"
 import { sanitizeQuizDirection } from "../css-sanitization"
 
 import { DEFAULT_N } from "./migrationSettings"
diff --git a/services/quizzes/src/util/migration/privateSpecQuiz.ts b/services/quizzes/src/util/migration/privateSpecQuiz.ts
index 2c0016b3f03a..874b56252678 100644
--- a/services/quizzes/src/util/migration/privateSpecQuiz.ts
+++ b/services/quizzes/src/util/migration/privateSpecQuiz.ts
@@ -1,7 +1,13 @@
 /* eslint-disable i18next/no-literal-string */
 /* stylelint-disable */
 import {
-  OldQuizItemType,
+  OldNormalizedQuizItemOption,
+  OldQuiz,
+  OldQuizItemOption,
+  QuizItem,
+} from "../../../types/oldQuizTypes"
+import { OldQuizItemType } from "../../../types/quizTypes/oldQuizTypes"
+import {
   PrivateSpecQuiz,
   PrivateSpecQuizItemCheckbox,
   PrivateSpecQuizItemChooseN,
@@ -13,7 +19,6 @@ import {
   PrivateSpecQuizItemScale,
   PrivateSpecQuizItemTimeline,
 } from "../../../types/quizTypes/privateSpec"
-import { NormalizedQuizItemOption, Quiz, QuizItem, QuizItemOption } from "../../../types/types"
 import { sanitizeQuizDirection } from "../css-sanitization"
 
 import { DEFAULT_N } from "./migrationSettings"
@@ -21,9 +26,9 @@ import { DEFAULT_N } from "./migrationSettings"
 const CHOOSE_N_DEFAULT_VALUE = DEFAULT_N
 
 export const convertNormalizedQuizItemOptionsToQuizItemOptions = (
-  quizOptions: NormalizedQuizItemOption[],
+  quizOptions: OldNormalizedQuizItemOption[],
 ) => {
-  const result: QuizItemOption[] = quizOptions.map((item) => ({
+  const result: OldQuizItemOption[] = quizOptions.map((item) => ({
     id: item.id,
     quizItemId: item.quizItemId,
     order: item.order,
@@ -170,11 +175,11 @@ export const migratePrivateSpecQuizItem = (quizItem: QuizItem) => {
  * Migrate quiz into newer format.
  *
  * @param oldQuiz Older version of Quiz
- * @see Quiz
+ * @see OldQuiz
  * @see PrivateSpecQuiz
  * @returns New version of Quiz
  */
-export const migratePrivateSpecQuiz = (oldQuiz: Quiz): PrivateSpecQuiz => {
+export const migratePrivateSpecQuiz = (oldQuiz: OldQuiz): PrivateSpecQuiz => {
   const privateSpecQuiz: PrivateSpecQuiz = {
     version: "2",
     title: oldQuiz.title,
diff --git a/services/quizzes/src/util/migration/publicSpecQuiz.ts b/services/quizzes/src/util/migration/publicSpecQuiz.ts
index 8e247506d59d..28424701413f 100644
--- a/services/quizzes/src/util/migration/publicSpecQuiz.ts
+++ b/services/quizzes/src/util/migration/publicSpecQuiz.ts
@@ -1,3 +1,4 @@
+import { OldPublicQuiz, OldPublicQuizItem } from "../../../types/oldQuizTypes"
 import { OldQuizItemType } from "../../../types/quizTypes/oldQuizTypes"
 import {
   PublicQuizItemOption,
@@ -13,14 +14,13 @@ import {
   PublicSpecQuizItemScale,
   PublicSpecQuizItemTimeline,
 } from "../../../types/quizTypes/publicSpec"
-import { PublicQuiz, PublicQuizItem } from "../../../types/types"
 import { sanitizeQuizDirection } from "../css-sanitization"
 
 import { DEFAULT_N } from "./migrationSettings"
 
 const CHOOSE_N_DEFAULT_VALUE = DEFAULT_N
 
-const migratePublicSpecQuizItem = (quizItem: PublicQuizItem): PublicSpecQuizItem => {
+const migratePublicSpecQuizItem = (quizItem: OldPublicQuizItem): PublicSpecQuizItem => {
   switch (quizItem.type as OldQuizItemType) {
     case "essay":
       return {
@@ -136,7 +136,7 @@ const migratePublicSpecQuizItem = (quizItem: PublicQuizItem): PublicSpecQuizItem
   }
 }
 
-const migratePublicSpecQuiz = (oldPublicSpecQuiz: PublicQuiz): PublicSpecQuiz => {
+const migratePublicSpecQuiz = (oldPublicSpecQuiz: OldPublicQuiz): PublicSpecQuiz => {
   const PublicSpecQuiz: PublicSpecQuiz = {
     version: "2",
     body: oldPublicSpecQuiz.body,
diff --git a/services/quizzes/src/util/migration/userAnswerSpec.ts b/services/quizzes/src/util/migration/userAnswerSpec.ts
index d4c86a9d2875..b37824beb9f4 100644
--- a/services/quizzes/src/util/migration/userAnswerSpec.ts
+++ b/services/quizzes/src/util/migration/userAnswerSpec.ts
@@ -1,3 +1,4 @@
+import { OldQuizAnswer, OldQuizItemAnswer } from "../../../types/oldQuizTypes"
 import {
   UserAnswer,
   UserItemAnswer,
@@ -13,9 +14,8 @@ import {
 } from "../../../types/quizTypes/answer"
 import { PrivateSpecQuiz, PrivateSpecQuizItem } from "../../../types/quizTypes/privateSpec"
 import { PublicSpecQuiz, PublicSpecQuizItem } from "../../../types/quizTypes/publicSpec"
-import { QuizAnswer, QuizItemAnswer } from "../../../types/types"
 
-const convertIntDataForScale = (quizItemAnswer: QuizItemAnswer) => {
+const convertIntDataForScale = (quizItemAnswer: OldQuizItemAnswer) => {
   if (!quizItemAnswer.intData) {
     if (quizItemAnswer.optionAnswers && quizItemAnswer.optionAnswers.length > 0) {
       try {
@@ -29,7 +29,7 @@ const convertIntDataForScale = (quizItemAnswer: QuizItemAnswer) => {
 }
 
 const migrateQuizItemAnswer = (
-  quizItemAnswer: QuizItemAnswer,
+  quizItemAnswer: OldQuizItemAnswer,
   quizItem: PrivateSpecQuizItem | PublicSpecQuizItem,
 ): UserItemAnswer => {
   switch (quizItem.type) {
@@ -109,7 +109,7 @@ const migrateQuizItemAnswer = (
 }
 
 const migrateQuizAnswer = (
-  quizAnswer: QuizAnswer | null,
+  quizAnswer: OldQuizAnswer | null,
   privateSpecQuiz: PrivateSpecQuiz | PublicSpecQuiz | null,
 ): UserAnswer | null => {
   if (quizAnswer === null || privateSpecQuiz === null) {
diff --git a/services/quizzes/tests/api/utils/quizGenerator.ts b/services/quizzes/tests/api/utils/quizGenerator.ts
index 694cecd714cf..fedcf3caeb0f 100644
--- a/services/quizzes/tests/api/utils/quizGenerator.ts
+++ b/services/quizzes/tests/api/utils/quizGenerator.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
 import { NonGenericGradingRequest } from "../../../src/shared-module/exercise-service-protocol-types";
 import { COLUMN } from "../../../src/util/constants";
-import { multipleChoiceMultipleOptionsGradingPolicy, Quiz, QuizAnswer, QuizItem, QuizItemAnswer, QuizItemOption } from "../../../types/types";
+import { oldMultipleChoiceMultipleOptionsGradingPolicy, OldQuiz, OldQuizAnswer, QuizItem, OldQuizItemAnswer, OldQuizItemOption } from "../../../types/oldQuizTypes";
 
 
-const emptyQuizAnswer = (): QuizAnswer => ({
+const emptyQuizAnswer = (): OldQuizAnswer => ({
   createdAt: '',
   updatedAt: '',
   id: '',
@@ -12,7 +12,7 @@ const emptyQuizAnswer = (): QuizAnswer => ({
   quizId: '',
   status: "open",
 })
-const emptyQuizItemAnswer = (): QuizItemAnswer => ({
+const emptyQuizItemAnswer = (): OldQuizItemAnswer => ({
   id: "v4()",
   quizAnswerId: "v4()",
   quizItemId: "v4()",
@@ -30,7 +30,7 @@ const emptyQuizItemAnswer = (): QuizItemAnswer => ({
   timelineChoices: null
 })
 
-const emptyQuizItemOption = (): QuizItemOption => ({
+const emptyQuizItemOption = (): OldQuizItemOption => ({
   id: 'v4()',
   title: '',
   body: '',
@@ -74,7 +74,7 @@ const emptyQuizItem = (): QuizItem => ({
   usesSharedOptionFeedbackMessage: false
 })
 
-const emptyQuiz = (): Quiz => ({
+const emptyQuiz = (): OldQuiz => ({
   id: '',
   updatedAt: new Date(),
   createdAt: new Date(),
@@ -98,7 +98,7 @@ const emptyQuiz = (): Quiz => ({
   submitMessage: '',
 })
 
-export const generateQuiz = <T extends Partial<Quiz>>(initialValues: T): Quiz & T => {
+export const generateQuiz = <T extends Partial<OldQuiz>>(initialValues: T): OldQuiz & T => {
   return Object.assign(emptyQuiz(), initialValues);
 }
 
@@ -106,15 +106,15 @@ export const generateQuizItem = <T extends Partial<QuizItem>>(initialValues: T):
   return Object.assign(emptyQuizItem(), initialValues);
 }
 
-export const generateQuizItemOption = <T extends Partial<QuizItemOption>>(initialValues: T): QuizItemOption & T => {
+export const generateQuizItemOption = <T extends Partial<OldQuizItemOption>>(initialValues: T): OldQuizItemOption & T => {
   return Object.assign(emptyQuizItemOption(), initialValues);
 }
 
-export const generateQuizAnswer = <T extends Partial<QuizAnswer>>(initialValues: T): QuizAnswer & T => {
+export const generateQuizAnswer = <T extends Partial<OldQuizAnswer>>(initialValues: T): OldQuizAnswer & T => {
   return Object.assign(emptyQuizAnswer(), initialValues);
 }
 
-export const generateQuizItemAnswer = <T extends Partial<QuizItemAnswer>>(initialValues: T): QuizItemAnswer & T => {
+export const generateQuizItemAnswer = <T extends Partial<OldQuizItemAnswer>>(initialValues: T): OldQuizItemAnswer & T => {
   return Object.assign(emptyQuizItemAnswer(), initialValues);
 }
 
@@ -132,13 +132,13 @@ export const generateMultipleChoiceRequest = (
     numberOfOptions: number,
     numberOfCorrectOptions: number,
     options: string[],
-    multipleChoiceMultipleOptionsGradingPolicy: multipleChoiceMultipleOptionsGradingPolicy,
+    multipleChoiceMultipleOptionsGradingPolicy: oldMultipleChoiceMultipleOptionsGradingPolicy,
     multi=true
 ): NonGenericGradingRequest => {
   // Create quiz with multiple choice
   const quizItemId = 'multiple-choice-test-id'
 
-  let quizOptions: QuizItemOption[] = []
+  let quizOptions: OldQuizItemOption[] = []
   for (let i = 0; i < numberOfOptions; i++) {
     quizOptions.push(generateQuizItemOption({
       quizItemId,
diff --git a/services/quizzes/tests/util/migrationTests/modelSolutionSpecMigration.test.ts b/services/quizzes/tests/util/migrationTests/modelSolutionSpecMigration.test.ts
index a8d5e3f7944d..0ada6b750840 100644
--- a/services/quizzes/tests/util/migrationTests/modelSolutionSpecMigration.test.ts
+++ b/services/quizzes/tests/util/migrationTests/modelSolutionSpecMigration.test.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable i18next/no-literal-string */
 import migrateModelSolutionSpecQuiz from "../../../src/util/migration/modelSolutionSpecQuiz"
+import { OldModelSolutionQuizItem, OldQuizItemTimelineItem } from "../../../types/oldQuizTypes"
 import {
   ModelSolutionQuizItemCheckbox,
   ModelSolutionQuizItemChooseN,
@@ -10,7 +11,6 @@ import {
   ModelSolutionQuizItemScale,
   ModelSolutionQuizItemTimeline,
 } from "../../../types/quizTypes/modelSolutionSpec"
-import { ModelSolutionQuizItem, QuizItemTimelineItem } from "../../../types/types"
 
 import {
   compareModelSolutionSpecQuizItem,
@@ -40,11 +40,12 @@ describe("model solution spec migration of quizzes", () => {
   })
 
   test("migrates checkbox exercise", () => {
-    const checkboxQuizItem: ModelSolutionQuizItem = generateCheckboxForOlderModelSolutionSpecQuiz(1)
+    const checkboxQuizItem: OldModelSolutionQuizItem =
+      generateCheckboxForOlderModelSolutionSpecQuiz(1)
     const oldQuiz = packToModelSolutionSpecQuiz([checkboxQuizItem])
     const newQuiz = migrateModelSolutionSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: ModelSolutionQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldModelSolutionQuizItem = oldQuiz.items[0]
     const newQuizItem: ModelSolutionQuizItemCheckbox = newQuiz
       .items[0] as ModelSolutionQuizItemCheckbox
 
@@ -54,11 +55,11 @@ describe("model solution spec migration of quizzes", () => {
   })
 
   test("migrates essay exercise", () => {
-    const essayQuizItem: ModelSolutionQuizItem = generateEssayForOlderModelSolutionSpecQuiz(1)
+    const essayQuizItem: OldModelSolutionQuizItem = generateEssayForOlderModelSolutionSpecQuiz(1)
     const oldQuiz = packToModelSolutionSpecQuiz([essayQuizItem])
     const newQuiz = migrateModelSolutionSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: ModelSolutionQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldModelSolutionQuizItem = oldQuiz.items[0]
     const newQuizItem: ModelSolutionQuizItemEssay = newQuiz.items[0] as ModelSolutionQuizItemEssay
 
     expect(newQuizItem.type).toEqual("essay")
@@ -68,11 +69,11 @@ describe("model solution spec migration of quizzes", () => {
   })
 
   test("migrates matrix exercise", () => {
-    const matrixQuizItem: ModelSolutionQuizItem = generateMatrixForOlderModelSolutionSpecQuiz(1)
+    const matrixQuizItem: OldModelSolutionQuizItem = generateMatrixForOlderModelSolutionSpecQuiz(1)
     const oldQuiz = packToModelSolutionSpecQuiz([matrixQuizItem])
     const newQuiz = migrateModelSolutionSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: ModelSolutionQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldModelSolutionQuizItem = oldQuiz.items[0]
     const newQuizItem: ModelSolutionQuizItemMatrix = newQuiz.items[0] as ModelSolutionQuizItemMatrix
 
     expect(newQuizItem.type).toEqual("matrix")
@@ -81,11 +82,12 @@ describe("model solution spec migration of quizzes", () => {
   })
 
   test("migrates 'open' exercise", () => {
-    const openQuizItem: ModelSolutionQuizItem = generateClosedEndedForOlderModelSolutionSpecQuiz(1)
+    const openQuizItem: OldModelSolutionQuizItem =
+      generateClosedEndedForOlderModelSolutionSpecQuiz(1)
     const oldQuiz = packToModelSolutionSpecQuiz([openQuizItem])
     const newQuiz = migrateModelSolutionSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: ModelSolutionQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldModelSolutionQuizItem = oldQuiz.items[0]
     const newQuizItem: ModelSolutionQuizItemClosedEndedQuestion = newQuiz
       .items[0] as ModelSolutionQuizItemClosedEndedQuestion
 
@@ -95,11 +97,11 @@ describe("model solution spec migration of quizzes", () => {
   })
 
   test("migrates scale exercise", () => {
-    const scaleQuizItem: ModelSolutionQuizItem = generateScaleForOlderModelSolutionSpecQuiz(1)
+    const scaleQuizItem: OldModelSolutionQuizItem = generateScaleForOlderModelSolutionSpecQuiz(1)
     const oldQuiz = packToModelSolutionSpecQuiz([scaleQuizItem])
     const newQuiz = migrateModelSolutionSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: ModelSolutionQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldModelSolutionQuizItem = oldQuiz.items[0]
     const newQuizItem: ModelSolutionQuizItemScale = newQuiz.items[0] as ModelSolutionQuizItemScale
 
     expect(newQuizItem.type).toEqual("scale")
@@ -108,16 +110,17 @@ describe("model solution spec migration of quizzes", () => {
   })
 
   test("migrates timeline exercise", () => {
-    const timelineQuizItem: ModelSolutionQuizItem = generateTimelineForOlderModelSolutionSpecQuiz(1)
+    const timelineQuizItem: OldModelSolutionQuizItem =
+      generateTimelineForOlderModelSolutionSpecQuiz(1)
     const oldQuiz = packToModelSolutionSpecQuiz([timelineQuizItem])
     const newQuiz = migrateModelSolutionSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: ModelSolutionQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldModelSolutionQuizItem = oldQuiz.items[0]
     const newQuizItem: ModelSolutionQuizItemTimeline = newQuiz
       .items[0] as ModelSolutionQuizItemTimeline
 
     // This will always be defined
-    const timelineItems: QuizItemTimelineItem[] = oldQuizItem.timelineItems ?? []
+    const timelineItems: OldQuizItemTimelineItem[] = oldQuizItem.timelineItems ?? []
 
     expect(newQuizItem.type).toEqual("timeline")
     expectModelSolutionSpecMetadataToMatch(oldQuiz, newQuiz)
@@ -128,14 +131,14 @@ describe("model solution spec migration of quizzes", () => {
   test("migrates clickable-multiple-choice exercise", () => {
     const numberOfOptions = 5
     const quizOrder = 1
-    const chooseNQuizItem: ModelSolutionQuizItem = generateChooseNForOlderModelSolutionSpecQuiz(
+    const chooseNQuizItem: OldModelSolutionQuizItem = generateChooseNForOlderModelSolutionSpecQuiz(
       numberOfOptions,
       quizOrder,
     )
     const oldQuiz = packToModelSolutionSpecQuiz([chooseNQuizItem])
     const newQuiz = migrateModelSolutionSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: ModelSolutionQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldModelSolutionQuizItem = oldQuiz.items[0]
     const newQuizItem: ModelSolutionQuizItemChooseN = newQuiz
       .items[0] as ModelSolutionQuizItemChooseN
 
diff --git a/services/quizzes/tests/util/migrationTests/privateSpecMigration.test.ts b/services/quizzes/tests/util/migrationTests/privateSpecMigration.test.ts
index 59939c1b0882..792c1cdcc6c5 100644
--- a/services/quizzes/tests/util/migrationTests/privateSpecMigration.test.ts
+++ b/services/quizzes/tests/util/migrationTests/privateSpecMigration.test.ts
@@ -3,6 +3,7 @@
 
 import { isOldQuiz } from "../../../src/util/migration/migrationSettings"
 import { migratePrivateSpecQuiz } from "../../../src/util/migration/privateSpecQuiz"
+import { OldQuiz, OldQuizItemTimelineItem, QuizItem } from "../../../types/oldQuizTypes"
 import {
   PrivateSpecQuiz,
   PrivateSpecQuizItemCheckbox,
@@ -14,7 +15,6 @@ import {
   PrivateSpecQuizItemScale,
   PrivateSpecQuizItemTimeline,
 } from "../../../types/quizTypes/privateSpec"
-import { Quiz, QuizItem, QuizItemTimelineItem } from "../../../types/types"
 import { generateQuiz } from "../../api/utils/quizGenerator"
 
 import { comparePrivateSpecQuizItem, expectPrivateSpecMetadataToMatch } from "./utils/comparison"
@@ -32,7 +32,7 @@ import {
 
 describe("private spec", () => {
   test("distinguishes between old and new quiz", () => {
-    const oldQuiz: Quiz = generateQuiz({
+    const oldQuiz: OldQuiz = generateQuiz({
       id: "example-quiz",
     })
     const newQuiz: PrivateSpecQuiz = migratePrivateSpecQuiz(oldQuiz)!
@@ -142,7 +142,7 @@ describe("private spec", () => {
     const newQuizItem: PrivateSpecQuizItemTimeline = newQuiz.items[0] as PrivateSpecQuizItemTimeline
 
     // This will always be defined
-    const timelineItems: QuizItemTimelineItem[] = oldQuizItem.timelineItems ?? []
+    const timelineItems: OldQuizItemTimelineItem[] = oldQuizItem.timelineItems ?? []
 
     expect(newQuizItem.type).toEqual("timeline")
     expectPrivateSpecMetadataToMatch(oldQuiz, newQuiz)
diff --git a/services/quizzes/tests/util/migrationTests/publicSpecMigration.test.ts b/services/quizzes/tests/util/migrationTests/publicSpecMigration.test.ts
index 74c456860355..ad4fd4283c3e 100644
--- a/services/quizzes/tests/util/migrationTests/publicSpecMigration.test.ts
+++ b/services/quizzes/tests/util/migrationTests/publicSpecMigration.test.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable i18next/no-literal-string */
 import migratePublicSpecQuiz from "../../../src/util/migration/publicSpecQuiz"
+import { OldPublicQuizItem, OldPublicTimelineItem } from "../../../types/oldQuizTypes"
 import {
   PublicSpecQuizItemCheckbox,
   PublicSpecQuizItemChooseN,
@@ -10,7 +11,6 @@ import {
   PublicSpecQuizItemScale,
   PublicSpecQuizItemTimeline,
 } from "../../../types/quizTypes/publicSpec"
-import { PublicQuizItem, PublicTimelineItem } from "../../../types/types"
 
 import { comparePublicSpecQuizItem, expectPublicSpecMetadataToMatch } from "./utils/comparison"
 import {
@@ -45,11 +45,11 @@ describe("public spec migration of quizzes", () => {
   })
 
   test("migrates checkbox exercise", () => {
-    const checkboxQuizItem: PublicQuizItem = generateCheckboxForOlderPublicSpecQuiz(1)
+    const checkboxQuizItem: OldPublicQuizItem = generateCheckboxForOlderPublicSpecQuiz(1)
     const oldQuiz = packToPublicSpecQuiz([checkboxQuizItem])
     const newQuiz = migratePublicSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: PublicQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldPublicQuizItem = oldQuiz.items[0]
     const newQuizItem: PublicSpecQuizItemCheckbox = newQuiz.items[0] as PublicSpecQuizItemCheckbox
 
     expect(newQuizItem.type).toEqual("checkbox")
@@ -58,11 +58,11 @@ describe("public spec migration of quizzes", () => {
   })
 
   test("migrates essay exercise", () => {
-    const essayQuizItem: PublicQuizItem = generateEssayForOlderPublicSpecQuiz(1)
+    const essayQuizItem: OldPublicQuizItem = generateEssayForOlderPublicSpecQuiz(1)
     const oldQuiz = packToPublicSpecQuiz([essayQuizItem])
     const newQuiz = migratePublicSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: PublicQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldPublicQuizItem = oldQuiz.items[0]
     const newQuizItem: PublicSpecQuizItemEssay = newQuiz.items[0] as PublicSpecQuizItemEssay
 
     expect(newQuizItem.type).toEqual("essay")
@@ -72,11 +72,11 @@ describe("public spec migration of quizzes", () => {
   })
 
   test("migrates matrix exercise", () => {
-    const matrixQuizItem: PublicQuizItem = generateMatrixForOlderPublicSpecQuiz(1)
+    const matrixQuizItem: OldPublicQuizItem = generateMatrixForOlderPublicSpecQuiz(1)
     const oldQuiz = packToPublicSpecQuiz([matrixQuizItem])
     const newQuiz = migratePublicSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: PublicQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldPublicQuizItem = oldQuiz.items[0]
     const newQuizItem: PublicSpecQuizItemMatrix = newQuiz.items[0] as PublicSpecQuizItemMatrix
 
     expect(newQuizItem.type).toEqual("matrix")
@@ -85,11 +85,11 @@ describe("public spec migration of quizzes", () => {
   })
 
   test("migrates 'open' exercise", () => {
-    const openQuizItem: PublicQuizItem = generateClosedEndedForOlderPublicSpecQuiz(1)
+    const openQuizItem: OldPublicQuizItem = generateClosedEndedForOlderPublicSpecQuiz(1)
     const oldQuiz = packToPublicSpecQuiz([openQuizItem])
     const newQuiz = migratePublicSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: PublicQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldPublicQuizItem = oldQuiz.items[0]
     const newQuizItem: PublicSpecQuizItemClosedEndedQuestion = newQuiz
       .items[0] as PublicSpecQuizItemClosedEndedQuestion
 
@@ -99,11 +99,11 @@ describe("public spec migration of quizzes", () => {
   })
 
   test("migrates scale exercise", () => {
-    const scaleQuizItem: PublicQuizItem = generateScaleForOlderPublicSpecQuiz(1)
+    const scaleQuizItem: OldPublicQuizItem = generateScaleForOlderPublicSpecQuiz(1)
     const oldQuiz = packToPublicSpecQuiz([scaleQuizItem])
     const newQuiz = migratePublicSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: PublicQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldPublicQuizItem = oldQuiz.items[0]
     const newQuizItem: PublicSpecQuizItemScale = newQuiz.items[0] as PublicSpecQuizItemScale
 
     expect(newQuizItem.type).toEqual("scale")
@@ -112,15 +112,15 @@ describe("public spec migration of quizzes", () => {
   })
 
   test("migrates timeline exercise", () => {
-    const timelineQuizItem: PublicQuizItem = generateTimelineForOlderPublicSpecQuiz(1)
+    const timelineQuizItem: OldPublicQuizItem = generateTimelineForOlderPublicSpecQuiz(1)
     const oldQuiz = packToPublicSpecQuiz([timelineQuizItem])
     const newQuiz = migratePublicSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: PublicQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldPublicQuizItem = oldQuiz.items[0]
     const newQuizItem: PublicSpecQuizItemTimeline = newQuiz.items[0] as PublicSpecQuizItemTimeline
 
     // This will always be defined
-    const timelineItems: PublicTimelineItem[] = oldQuizItem.timelineItems ?? []
+    const timelineItems: OldPublicTimelineItem[] = oldQuizItem.timelineItems ?? []
 
     expect(newQuizItem.type).toEqual("timeline")
     expectPublicSpecMetadataToMatch(oldQuiz, newQuiz)
@@ -136,14 +136,14 @@ describe("public spec migration of quizzes", () => {
   test("migrates clickable-multiple-choice exercise", () => {
     const numberOfOptions = 5
     const quizOrder = 1
-    const chooseNQuizItem: PublicQuizItem = generateChooseNForOlderPublicSpecQuiz(
+    const chooseNQuizItem: OldPublicQuizItem = generateChooseNForOlderPublicSpecQuiz(
       numberOfOptions,
       quizOrder,
     )
     const oldQuiz = packToPublicSpecQuiz([chooseNQuizItem])
     const newQuiz = migratePublicSpecQuiz(oldQuiz)!
 
-    const oldQuizItem: PublicQuizItem = oldQuiz.items[0]
+    const oldQuizItem: OldPublicQuizItem = oldQuiz.items[0]
     const newQuizItem: PublicSpecQuizItemChooseN = newQuiz.items[0] as PublicSpecQuizItemChooseN
 
     expect(newQuizItem.type).toEqual("choose-n")
diff --git a/services/quizzes/tests/util/migrationTests/userAnswerMigration.test.ts b/services/quizzes/tests/util/migrationTests/userAnswerMigration.test.ts
index 6dbe95037bce..b32d1545f30a 100644
--- a/services/quizzes/tests/util/migrationTests/userAnswerMigration.test.ts
+++ b/services/quizzes/tests/util/migrationTests/userAnswerMigration.test.ts
@@ -2,6 +2,7 @@
 /* eslint-disable i18next/no-literal-string */
 import { migratePrivateSpecQuiz } from "../../../src/util/migration/privateSpecQuiz"
 import migrateQuizAnswer from "../../../src/util/migration/userAnswerSpec"
+import { QuizItem } from "../../../types/oldQuizTypes"
 import {
   UserItemAnswer,
   UserItemAnswerCheckbox,
@@ -16,7 +17,6 @@ import {
   PrivateSpecQuizItemScale,
   PrivateSpecQuizItemTimeline,
 } from "../../../types/quizTypes/privateSpec"
-import { QuizItem } from "../../../types/types"
 
 import { compareUserItemAnswer } from "./utils/comparison"
 import {
diff --git a/services/quizzes/tests/util/migrationTests/utils/comparison.ts b/services/quizzes/tests/util/migrationTests/utils/comparison.ts
index 70c2dfece57b..9e1699da841c 100644
--- a/services/quizzes/tests/util/migrationTests/utils/comparison.ts
+++ b/services/quizzes/tests/util/migrationTests/utils/comparison.ts
@@ -1,6 +1,15 @@
 /* eslint-disable i18next/no-literal-string */
 
 import { FlexDirection, sanitizeQuizDirection } from "../../../../src/util/css-sanitization"
+import {
+  OldModelSolutionQuiz as OldModelSolutionQuiz,
+  OldModelSolutionQuizItem as OldModelSolutionQuizItem,
+  OldPublicQuiz,
+  OldPublicQuizItem,
+  OldQuiz,
+  OldQuizItemAnswer,
+  QuizItem,
+} from "../../../../types/oldQuizTypes"
 import { UserItemAnswer } from "../../../../types/quizTypes/answer"
 import {
   ModelSolutionQuiz,
@@ -8,15 +17,6 @@ import {
 } from "../../../../types/quizTypes/modelSolutionSpec"
 import { PrivateSpecQuiz, PrivateSpecQuizItem } from "../../../../types/quizTypes/privateSpec"
 import { PublicSpecQuiz, PublicSpecQuizItem } from "../../../../types/quizTypes/publicSpec"
-import {
-  ModelSolutionQuiz as OldModelSolutionQuiz,
-  ModelSolutionQuizItem as OldModelSolutionQuizItem,
-  PublicQuiz,
-  PublicQuizItem,
-  Quiz,
-  QuizItem,
-  QuizItemAnswer,
-} from "../../../../types/types"
 
 const QUIZ_VERSION = "2"
 
@@ -27,7 +27,7 @@ const QUIZ_VERSION = "2"
  * @param version Version of the private spec quiz
  */
 const expectPrivateSpecMetadataToMatch = (
-  oldQuiz: Quiz,
+  oldQuiz: OldQuiz,
   privateSpecQuiz: PrivateSpecQuiz,
   version = QUIZ_VERSION,
 ) => {
@@ -46,7 +46,7 @@ const expectPrivateSpecMetadataToMatch = (
  * @param version Version of the public spec quiz
  */
 const expectPublicSpecMetadataToMatch = (
-  oldQuiz: PublicQuiz,
+  oldQuiz: OldPublicQuiz,
   publicSpecQuiz: PublicSpecQuiz,
   version = QUIZ_VERSION,
 ) => {
@@ -229,7 +229,7 @@ const comparePrivateSpecQuizItem = (
 
 const comparePublicSpecQuizItem = (
   publicSpecQuizItem: PublicSpecQuizItem,
-  oldQuizItem: PublicQuizItem,
+  oldQuizItem: OldPublicQuizItem,
 ) => {
   let fields = {}
   switch (publicSpecQuizItem.type) {
@@ -314,7 +314,7 @@ const comparePublicSpecQuizItem = (
       }
       break
   }
-  compareFields<PublicSpecQuizItem, PublicQuizItem>(fields, publicSpecQuizItem, oldQuizItem)
+  compareFields<PublicSpecQuizItem, OldPublicQuizItem>(fields, publicSpecQuizItem, oldQuizItem)
 }
 
 const compareModelSolutionSpecQuizItem = (
@@ -429,7 +429,10 @@ const compareModelSolutionSpecQuizItem = (
   )
 }
 
-const compareUserItemAnswer = (quizItemAnswer: QuizItemAnswer, userItemAnswer: UserItemAnswer) => {
+const compareUserItemAnswer = (
+  quizItemAnswer: OldQuizItemAnswer,
+  userItemAnswer: UserItemAnswer,
+) => {
   let fields = {}
 
   switch (userItemAnswer.type) {
@@ -507,7 +510,7 @@ const compareUserItemAnswer = (quizItemAnswer: QuizItemAnswer, userItemAnswer: U
       break
   }
 
-  compareFields<QuizItemAnswer, UserItemAnswer>(fields, quizItemAnswer, userItemAnswer)
+  compareFields<OldQuizItemAnswer, UserItemAnswer>(fields, quizItemAnswer, userItemAnswer)
 }
 
 export {
diff --git a/services/quizzes/tests/util/migrationTests/utils/exerciseGeneration.ts b/services/quizzes/tests/util/migrationTests/utils/exerciseGeneration.ts
index 67816e76add8..9e84d2efb872 100644
--- a/services/quizzes/tests/util/migrationTests/utils/exerciseGeneration.ts
+++ b/services/quizzes/tests/util/migrationTests/utils/exerciseGeneration.ts
@@ -1,12 +1,12 @@
 /* eslint-disable */
-import { ModelSolutionQuiz, ModelSolutionQuizItem, PublicQuiz, PublicQuizItem, PublicQuizItemOption, Quiz, QuizItem, QuizItemOption, QuizItemTimelineItem } from "../../../../types/types"
+import { OldModelSolutionQuiz, OldModelSolutionQuizItem, OldPublicQuiz, OldPublicQuizItem, OldPublicQuizItemOption, OldQuiz, QuizItem, OldQuizItemOption, OldQuizItemTimelineItem } from "../../../../types/oldQuizTypes"
 
 
 
 // Content for private quiz item
 
 // Private spec quiz
-const emptyPrivateQuizItemOption = (): QuizItemOption => ({
+const emptyPrivateQuizItemOption = (): OldQuizItemOption => ({
   id: 'v4()',
   title: '',
   body: '',
@@ -50,7 +50,7 @@ const emptyPrivateQuizItem = (): QuizItem => ({
   usesSharedOptionFeedbackMessage: false
 })
 
-const emptyPrivateQuiz = (): Quiz => ({
+const emptyPrivateQuiz = (): OldQuiz => ({
   id: '',
   updatedAt: new Date(),
   createdAt: new Date(),
@@ -75,7 +75,7 @@ const emptyPrivateQuiz = (): Quiz => ({
 })
 
 // Public spec quiz
-const emptyPublicQuiz = (): PublicQuiz => ({
+const emptyPublicQuiz = (): OldPublicQuiz => ({
   body: "",
   courseId: "",
   deadline: new Date(),
@@ -90,7 +90,7 @@ const emptyPublicQuiz = (): PublicQuiz => ({
   triesLimited: false
 })
 
-const emptyPublicQuizItem = (): PublicQuizItem => ({
+const emptyPublicQuizItem = (): OldPublicQuizItem => ({
   body: "",
   direction: "column",
   formatRegex: "",
@@ -113,7 +113,7 @@ const emptyPublicQuizItem = (): PublicQuizItem => ({
   type: ""
 })
 
-const emptyPublicQuizItemOption = (): PublicQuizItemOption => ({
+const emptyPublicQuizItemOption = (): OldPublicQuizItemOption => ({
   body: "",
   id: "",
   order: 0,
@@ -122,7 +122,7 @@ const emptyPublicQuizItemOption = (): PublicQuizItemOption => ({
 })
 
 // Model solution spec
-const emptyModelSolutionQuiz = (): ModelSolutionQuiz => ({
+const emptyModelSolutionQuiz = (): OldModelSolutionQuiz => ({
   autoConfirm: false,
   autoReject: false,
   awardPointsEvenIfWrong: false,
@@ -145,7 +145,7 @@ const emptyModelSolutionQuiz = (): ModelSolutionQuiz => ({
   updatedAt: new Date(),
 })
 
-const emptyModelSolutionQuizItem = (): ModelSolutionQuizItem => ({
+const emptyModelSolutionQuizItem = (): OldModelSolutionQuizItem => ({
   allAnswersCorrect: false,
   body: "",
   createdAt: new Date(),
@@ -177,7 +177,7 @@ const emptyModelSolutionQuizItem = (): ModelSolutionQuizItem => ({
 
 // Generate from templates above
 // Generate private spec quiz and quiz items
-export const generatePrivateQuiz = <T extends Partial<Quiz>>(initialValues: T): Quiz & T => {
+export const generatePrivateQuiz = <T extends Partial<OldQuiz>>(initialValues: T): OldQuiz & T => {
   return Object.assign(emptyPrivateQuiz(), initialValues);
 }
 
@@ -185,30 +185,30 @@ export const generatePrivateQuizItem = <T extends Partial<QuizItem>>(initialValu
   return Object.assign(emptyPrivateQuizItem(), initialValues);
 }
 
-export const generatePrivateQuizItemOption = <T extends Partial<QuizItemOption>>(initialValues: T): QuizItemOption & T => {
+export const generatePrivateQuizItemOption = <T extends Partial<OldQuizItemOption>>(initialValues: T): OldQuizItemOption & T => {
   return Object.assign(emptyPrivateQuizItemOption(), initialValues);
 }
 
 
 // Generate public spec quiz and quiz items
-export const generatePublicQuiz = <T extends Partial<PublicQuiz>>(initialValues: T): PublicQuiz & T => {
+export const generatePublicQuiz = <T extends Partial<OldPublicQuiz>>(initialValues: T): OldPublicQuiz & T => {
   return Object.assign(emptyPublicQuiz(), initialValues);
 }
 
-export const generatePublicQuizItem = <T extends Partial<PublicQuizItem>>(initialValues: T): PublicQuizItem & T => {
+export const generatePublicQuizItem = <T extends Partial<OldPublicQuizItem>>(initialValues: T): OldPublicQuizItem & T => {
   return Object.assign(emptyPublicQuizItem(), initialValues);
 }
 
-export const generatePublicQuizItemOption = <T extends Partial<PublicQuizItemOption>>(initialValues: T): PublicQuizItemOption & T => {
+export const generatePublicQuizItemOption = <T extends Partial<OldPublicQuizItemOption>>(initialValues: T): OldPublicQuizItemOption & T => {
   return Object.assign(emptyPublicQuizItemOption(), initialValues);
 }
 
 // Generate model solution spec quiz and quiz item
-export const generateModelSolutionQuiz = <T extends Partial<ModelSolutionQuiz>>(initialValues: T): ModelSolutionQuiz & T => {
+export const generateModelSolutionQuiz = <T extends Partial<OldModelSolutionQuiz>>(initialValues: T): OldModelSolutionQuiz & T => {
   return Object.assign(emptyModelSolutionQuiz(), initialValues);
 }
 
-export const generateModelSolutionQuizItem = <T extends Partial<ModelSolutionQuizItem>>(initialValues: T): ModelSolutionQuizItem & T => {
+export const generateModelSolutionQuizItem = <T extends Partial<OldModelSolutionQuizItem>>(initialValues: T): OldModelSolutionQuizItem & T => {
   return Object.assign(emptyModelSolutionQuizItem(), initialValues);
 }
 
@@ -229,7 +229,7 @@ const generateMultipleChoicePrivateSpecQuiz = (
   numberOfOptions: number,
   order: number,
 ): QuizItem => {
-  const quizOptions: QuizItemOption[] = []
+  const quizOptions: OldQuizItemOption[] = []
   for (let i = 0; i < numberOfOptions; i++) {
     quizOptions.push(
       generatePrivateQuizItemOption({
@@ -256,8 +256,8 @@ const generateMultipleChoicePrivateSpecQuiz = (
 const generateMultipleChoicePublicSpecQuiz = (
   numberOfOptions: number,
   order: number,
-): PublicQuizItem => {
-  const quizOptions: PublicQuizItemOption[] = []
+): OldPublicQuizItem => {
+  const quizOptions: OldPublicQuizItemOption[] = []
   for (let i = 0; i < numberOfOptions; i++) {
     quizOptions.push(
       generatePublicQuizItemOption({
@@ -284,8 +284,8 @@ const generateMultipleChoiceModelSolutionSpecQuiz = (
   correctOptions: number,
   numberOfOptions: number,
   order: number,
-): ModelSolutionQuizItem => {
-  const quizOptions: QuizItemOption[] = []
+): OldModelSolutionQuizItem => {
+  const quizOptions: OldQuizItemOption[] = []
   for (let i = 0; i < numberOfOptions; i++) {
     quizOptions.push(
       generatePrivateQuizItemOption({
@@ -310,7 +310,7 @@ const generateMultipleChoiceModelSolutionSpecQuiz = (
 }
 // CHOOSE N -EXERCISE GENERATION
 const generateChooseNForOlderPrivateSpecQuiz = (numberOfOptions: number, order: number): QuizItem => {
-  const quizOptions: QuizItemOption[] = []
+  const quizOptions: OldQuizItemOption[] = []
   for (let i = 0; i < numberOfOptions; i++) {
     quizOptions.push(
       generatePrivateQuizItemOption({
@@ -335,8 +335,8 @@ const generateChooseNForOlderPrivateSpecQuiz = (numberOfOptions: number, order:
   })
 }
 
-const generateChooseNForOlderPublicSpecQuiz = (numberOfOptions: number, order: number): PublicQuizItem => {
-  const quizOptions: QuizItemOption[] = []
+const generateChooseNForOlderPublicSpecQuiz = (numberOfOptions: number, order: number): OldPublicQuizItem => {
+  const quizOptions: OldQuizItemOption[] = []
   for (let i = 0; i < numberOfOptions; i++) {
     quizOptions.push(
       generatePrivateQuizItemOption({
@@ -361,8 +361,8 @@ const generateChooseNForOlderPublicSpecQuiz = (numberOfOptions: number, order: n
   })
 }
 
-const generateChooseNForOlderModelSolutionSpecQuiz = (numberOfOptions: number, order: number): ModelSolutionQuizItem => {
-  const quizOptions: QuizItemOption[] = []
+const generateChooseNForOlderModelSolutionSpecQuiz = (numberOfOptions: number, order: number): OldModelSolutionQuizItem => {
+  const quizOptions: OldQuizItemOption[] = []
   for (let i = 0; i < numberOfOptions; i++) {
     quizOptions.push(
       generatePrivateQuizItemOption({
@@ -400,7 +400,7 @@ const generateCheckboxForOlderPrivateSpecQuiz = (order: number): QuizItem => {
   })
 }
 
-const generateCheckboxForOlderPublicSpecQuiz = (order: number): PublicQuizItem => {
+const generateCheckboxForOlderPublicSpecQuiz = (order: number): OldPublicQuizItem => {
   return generatePublicQuizItem({
     id: "checkbox-exercise",
     type: "checkbox",
@@ -412,7 +412,7 @@ const generateCheckboxForOlderPublicSpecQuiz = (order: number): PublicQuizItem =
   })
 }
 
-const generateCheckboxForOlderModelSolutionSpecQuiz = (order: number): ModelSolutionQuizItem => {
+const generateCheckboxForOlderModelSolutionSpecQuiz = (order: number): OldModelSolutionQuizItem => {
   return generateModelSolutionQuizItem({
     id: "checkbox-exercise",
     type: "checkbox",
@@ -438,7 +438,7 @@ const generateEssayForOlderPrivateSpecQuiz = (order: number): QuizItem => {
   })
 }
 
-const generateEssayForOlderPublicSpecQuiz = (order: number): PublicQuizItem => {
+const generateEssayForOlderPublicSpecQuiz = (order: number): OldPublicQuizItem => {
   return generatePublicQuizItem({
     id: "essay-exercise",
     type: "essay",
@@ -452,7 +452,7 @@ const generateEssayForOlderPublicSpecQuiz = (order: number): PublicQuizItem => {
   })
 }
 
-const generateEssayForOlderModelSolutionSpecQuiz = (order: number): ModelSolutionQuizItem => {
+const generateEssayForOlderModelSolutionSpecQuiz = (order: number): OldModelSolutionQuizItem => {
   return generateModelSolutionQuizItem({
     id: "essay-exercise",
     type: "essay",
@@ -482,7 +482,7 @@ const generateMatrixForOlderPrivateSpecQuiz = (order: number): QuizItem => {
   })
 }
 
-const generateMatrixForOlderPublicSpecQuiz = (order: number): PublicQuizItem => {
+const generateMatrixForOlderPublicSpecQuiz = (order: number): OldPublicQuizItem => {
   return generatePublicQuizItem({
     id: "matrix-exercise",
     type: "matrix",
@@ -497,7 +497,7 @@ const generateMatrixForOlderPublicSpecQuiz = (order: number): PublicQuizItem =>
   })
 }
 
-const generateMatrixForOlderModelSolutionSpecQuiz = (order: number): ModelSolutionQuizItem => {
+const generateMatrixForOlderModelSolutionSpecQuiz = (order: number): OldModelSolutionQuizItem => {
   return generateModelSolutionQuizItem({
     id: "matrix-exercise",
     type: "matrix",
@@ -526,7 +526,7 @@ const generateClosedEndedForOlderPrivateSpecQuiz = (order: number): QuizItem =>
   })
 }
 
-const generateClosedEndedForOlderPublicSpecQuiz = (order: number): PublicQuizItem => {
+const generateClosedEndedForOlderPublicSpecQuiz = (order: number): OldPublicQuizItem => {
   return generatePublicQuizItem({
     id: "closed-ended-exercise",
     type: "open",
@@ -540,7 +540,7 @@ const generateClosedEndedForOlderPublicSpecQuiz = (order: number): PublicQuizIte
   })
 }
 
-const generateClosedEndedForOlderModelSolutionSpecQuiz = (order: number): ModelSolutionQuizItem => {
+const generateClosedEndedForOlderModelSolutionSpecQuiz = (order: number): OldModelSolutionQuizItem => {
   return generateModelSolutionQuizItem({
     id: "closed-ended-exercise",
     type: "open",
@@ -571,7 +571,7 @@ const generateScaleForOlderPrivateSpecQuiz = (order: number): QuizItem => {
   })
 }
 
-const generateScaleForOlderPublicSpecQuiz = (order: number): PublicQuizItem => {
+const generateScaleForOlderPublicSpecQuiz = (order: number): OldPublicQuizItem => {
   return generatePublicQuizItem({
     id: "scale-exercise",
     type: "scale",
@@ -587,7 +587,7 @@ const generateScaleForOlderPublicSpecQuiz = (order: number): PublicQuizItem => {
   })
 }
 
-const generateScaleForOlderModelSolutionSpecQuiz = (order: number): ModelSolutionQuizItem => {
+const generateScaleForOlderModelSolutionSpecQuiz = (order: number): OldModelSolutionQuizItem => {
   return generateModelSolutionQuizItem({
     id: "scale-exercise",
     type: "scale",
@@ -617,12 +617,12 @@ const generateTimelineForOlderPrivateSpecQuiz = (order: number): QuizItem => {
         year: "2000",
         correctEventName: "event-name-2000",
         correctEventId: "0001",
-      } as QuizItemTimelineItem,
+      } as OldQuizItemTimelineItem,
     ],
   })
 }
 
-const generateTimelineForOlderPublicSpecQuiz = (order: number): PublicQuizItem => {
+const generateTimelineForOlderPublicSpecQuiz = (order: number): OldPublicQuizItem => {
   return generatePublicQuizItem({
     id: "timeline-exercise",
     type: "timeline",
@@ -635,12 +635,12 @@ const generateTimelineForOlderPublicSpecQuiz = (order: number): PublicQuizItem =
         year: "2000",
         correctEventName: "event-name-2000",
         correctEventId: "0001",
-      } as QuizItemTimelineItem,
+      } as OldQuizItemTimelineItem,
     ],
   })
 }
 
-const generateTimelineForOlderModelSolutionSpecQuiz = (order: number): ModelSolutionQuizItem => {
+const generateTimelineForOlderModelSolutionSpecQuiz = (order: number): OldModelSolutionQuizItem => {
   return generateModelSolutionQuizItem({
     id: "timeline-exercise",
     type: "timeline",
@@ -653,7 +653,7 @@ const generateTimelineForOlderModelSolutionSpecQuiz = (order: number): ModelSolu
         year: "2000",
         correctEventName: "event-name-2000",
         correctEventId: "0001",
-      } as QuizItemTimelineItem,
+      } as OldQuizItemTimelineItem,
     ],
   })
 }
@@ -665,11 +665,11 @@ const packToPrivateSpecQuiz = (
 ) => (generatePrivateQuiz({ items: quizItems}))
 
 const packToPublicSpecQuiz = (
-  quizItems: PublicQuizItem[]
+  quizItems: OldPublicQuizItem[]
 ) => generatePublicQuiz({ items: quizItems })
 
 const packToModelSolutionSpecQuiz = (
-  quizItems: ModelSolutionQuizItem[]
+  quizItems: OldModelSolutionQuizItem[]
 ) => generateModelSolutionQuiz({ items: quizItems })
 
 export {
diff --git a/services/quizzes/tests/util/migrationTests/utils/userAnswerGeneration.ts b/services/quizzes/tests/util/migrationTests/utils/userAnswerGeneration.ts
index 7ae7af3a1079..7682d949ec8e 100644
--- a/services/quizzes/tests/util/migrationTests/utils/userAnswerGeneration.ts
+++ b/services/quizzes/tests/util/migrationTests/utils/userAnswerGeneration.ts
@@ -1,8 +1,8 @@
 /* eslint-disable i18next/no-literal-string */
-import { QuizAnswer, QuizItemAnswer } from "../../../../types/types"
+import { OldQuizAnswer, OldQuizItemAnswer } from "../../../../types/oldQuizTypes"
 
 // Quiz answers
-const emptyQuizAnswer = (): QuizAnswer => ({
+const emptyQuizAnswer = (): OldQuizAnswer => ({
   createdAt: "",
   updatedAt: "",
   id: "",
@@ -11,7 +11,7 @@ const emptyQuizAnswer = (): QuizAnswer => ({
   status: "open",
 })
 
-const emptyQuizItemAnswer = (): QuizItemAnswer => ({
+const emptyQuizItemAnswer = (): OldQuizItemAnswer => ({
   id: "v4()",
   quizAnswerId: "v4()",
   quizItemId: "v4()",
@@ -30,40 +30,40 @@ const emptyQuizItemAnswer = (): QuizItemAnswer => ({
 })
 
 // Quiz answer generation
-export const generateQuizAnswer = <T extends Partial<QuizAnswer>>(
+export const generateQuizAnswer = <T extends Partial<OldQuizAnswer>>(
   initialValues: T,
-): QuizAnswer & T => {
+): OldQuizAnswer & T => {
   return Object.assign(emptyQuizAnswer(), initialValues)
 }
 
-export const generateQuizItemAnswer = <T extends Partial<QuizItemAnswer>>(
+export const generateQuizItemAnswer = <T extends Partial<OldQuizItemAnswer>>(
   initialValues: T,
-): QuizItemAnswer & T => {
+): OldQuizItemAnswer & T => {
   return Object.assign(emptyQuizItemAnswer(), initialValues)
 }
 
-const generateUserAnswerForCheckbox = (quizItemId: string): QuizItemAnswer => {
+const generateUserAnswerForCheckbox = (quizItemId: string): OldQuizItemAnswer => {
   return generateQuizItemAnswer({
     quizItemId,
     intData: 1,
   })
 }
 
-const generateUserAnswerForClosedEnded = (quizItemId: string): QuizItemAnswer => {
+const generateUserAnswerForClosedEnded = (quizItemId: string): OldQuizItemAnswer => {
   return generateQuizItemAnswer({
     quizItemId,
     textData: "answer for closed ended question.",
   })
 }
 
-const generateUserAnswerForEssay = (quizItemId: string): QuizItemAnswer => {
+const generateUserAnswerForEssay = (quizItemId: string): OldQuizItemAnswer => {
   return generateQuizItemAnswer({
     quizItemId,
     textData: "essay answer for the exercise.",
   })
 }
 
-const generateUserAnswerForMatrix = (quizItemId: string): QuizItemAnswer => {
+const generateUserAnswerForMatrix = (quizItemId: string): OldQuizItemAnswer => {
   return generateQuizItemAnswer({
     quizItemId,
     optionCells: [
@@ -74,35 +74,35 @@ const generateUserAnswerForMatrix = (quizItemId: string): QuizItemAnswer => {
   })
 }
 
-const generateUserAnswerForScale = (quizItemId: string): QuizItemAnswer => {
+const generateUserAnswerForScale = (quizItemId: string): OldQuizItemAnswer => {
   return generateQuizItemAnswer({
     quizItemId,
     optionAnswers: ["0", "1", "2"],
   })
 }
 
-const generateUserAnswerForTimeline = (quizItemId: string): QuizItemAnswer => {
+const generateUserAnswerForTimeline = (quizItemId: string): OldQuizItemAnswer => {
   return generateQuizItemAnswer({
     quizItemId,
     timelineChoices: [],
   })
 }
 
-const generateUserAnswerForMultipleChoice = (quizItemId: string): QuizItemAnswer => {
+const generateUserAnswerForMultipleChoice = (quizItemId: string): OldQuizItemAnswer => {
   return generateQuizItemAnswer({
     quizItemId,
     optionAnswers: ["0", "1"],
   })
 }
 
-const generateUserAnswerForChooseN = (quizItemId: string): QuizItemAnswer => {
+const generateUserAnswerForChooseN = (quizItemId: string): OldQuizItemAnswer => {
   return generateQuizItemAnswer({
     quizItemId,
     optionAnswers: ["0", "1"],
   })
 }
 
-const packUserAnswers = (quizAnswers: QuizItemAnswer[]) =>
+const packUserAnswers = (quizAnswers: OldQuizItemAnswer[]) =>
   generateQuizAnswer({ itemAnswers: quizAnswers })
 
 export {
diff --git a/services/quizzes/types/types.d.ts b/services/quizzes/types/oldQuizTypes.ts
similarity index 80%
rename from services/quizzes/types/types.d.ts
rename to services/quizzes/types/oldQuizTypes.ts
index 6020d548733e..5ce805873ab3 100644
--- a/services/quizzes/types/types.d.ts
+++ b/services/quizzes/types/oldQuizTypes.ts
@@ -1,5 +1,5 @@
 /** @deprecated */
-export interface Quiz {
+export interface OldQuiz {
   id: string
   courseId: string
   part: number
@@ -24,7 +24,7 @@ export interface Quiz {
 }
 
 /** @deprecated */
-export interface NormalizedQuiz {
+export interface OldNormalizedQuiz {
   id: string
   courseId: string
   part: number
@@ -50,8 +50,8 @@ export interface NormalizedQuiz {
 }
 
 /** @deprecated */
-export interface QuizVariables {
-  initialState: Quiz
+export interface OldQuizVariables {
+  initialState: OldQuiz
   addingNewItem: boolean
   newItemType: string
   newItems: string[]
@@ -62,7 +62,7 @@ export interface QuizVariables {
 }
 
 /** @deprecated */
-export interface PublicQuiz {
+export interface OldPublicQuiz {
   id: string
   courseId: string
   part: number
@@ -72,13 +72,13 @@ export interface PublicQuiz {
   open: Date | null
   tries: number
   triesLimited: boolean
-  items: PublicQuizItem[]
+  items: OldPublicQuizItem[]
   title: string
   body: string
 }
 
 /** @deprecated */
-export interface ModelSolutionQuiz {
+export interface OldModelSolutionQuiz {
   id: string
   courseId: string
   part: number
@@ -95,14 +95,14 @@ export interface ModelSolutionQuiz {
   awardPointsEvenIfWrong: boolean
   grantPointsPolicy: "grant_whenever_possible" | "grant_only_when_answer_fully_correct"
   autoReject: boolean
-  items: ModelSolutionQuizItem[]
+  items: OldModelSolutionQuizItem[]
   title: string
   body: string
   submitMessage: string | null
 }
 
 /** @deprecated */
-type multipleChoiceMultipleOptionsGradingPolicy =
+export type oldMultipleChoiceMultipleOptionsGradingPolicy =
   | "default"
   | "points-off-incorrect-options"
   | "points-off-unselected-options"
@@ -126,7 +126,7 @@ export interface QuizItem {
   maxLabel: string | null
   minLabel: string | null
   usesSharedOptionFeedbackMessage: boolean
-  options: QuizItemOption[]
+  options: OldQuizItemOption[]
   optionCells: string[][] | null
   title: string
   body: string
@@ -135,20 +135,20 @@ export interface QuizItem {
   sharedOptionFeedbackMessage: null
   allAnswersCorrect: boolean
   direction: "row" | "column"
-  timelineItems: QuizItemTimelineItem[] | null
-  multipleChoiceMultipleOptionsGradingPolicy: multipleChoiceMultipleOptionsGradingPolicy
+  timelineItems: OldQuizItemTimelineItem[] | null
+  multipleChoiceMultipleOptionsGradingPolicy: oldMultipleChoiceMultipleOptionsGradingPolicy
 }
 
 /** @deprecated */
-export interface QuizItemModelSolution {
+export interface OldQuizItemModelSolution {
   quizItemId: string
-  options?: OptionsFeedback[]
+  options?: OldOptionsFeedback[]
   successMessage?: string
   failureMessage?: string
 }
 
 /** @deprecated */
-export interface OptionsFeedback {
+export interface OldOptionsFeedback {
   optionId: string
   successMessage?: string
   failureMessage?: string
@@ -160,9 +160,9 @@ export interface OptionsFeedback {
  * See this for an introduction to normalization in Redux: https://redux.js.org/tutorials/essentials/part-6-performance-normalization#normalizing-data
  */
 /** @deprecated */
-export interface NormalizedQuizItem {
+export interface OldNormalizedQuizItem {
   shuffleOptions: boolean
-  multipleChoiceMultipleOptionsGradingPolicy: multipleChoiceMultipleOptionsGradingPolicy
+  multipleChoiceMultipleOptionsGradingPolicy: oldMultipleChoiceMultipleOptionsGradingPolicy
   id: string
   quizId: string
   type: string
@@ -191,7 +191,7 @@ export interface NormalizedQuizItem {
 }
 
 /** @deprecated */
-export interface QuizItemVariables {
+export interface OldQuizItemVariables {
   scaleMin: number
   scaleMax: number
   array: number[]
@@ -209,7 +209,7 @@ export interface QuizItemVariables {
 }
 
 /** @deprecated */
-export interface PublicQuizItem {
+export interface OldPublicQuizItem {
   id: string
   quizId: string
   type: string
@@ -217,17 +217,17 @@ export interface PublicQuizItem {
   formatRegex: string | null
   multi: boolean
   shuffleOptions: boolean
-  multipleChoiceMultipleOptionsGradingPolicy: multipleChoiceMultipleOptionsGradingPolicy
+  multipleChoiceMultipleOptionsGradingPolicy: oldMultipleChoiceMultipleOptionsGradingPolicy
   minWords: number | null
   maxWords: number | null
   maxValue: number | null
   minValue: number | null
   maxLabel: string | null
   minLabel: string | null
-  options: PublicQuizItemOption[]
-  timelineItems: PublicTimelineItem[]
+  options: OldPublicQuizItemOption[]
+  timelineItems: OldPublicTimelineItem[]
   /** A list of events to choose from when matching years to events. */
-  timelineItemEvents: PublicTimelineEvent[]
+  timelineItemEvents: OldPublicTimelineEvent[]
   title: string
   body: string
   direction: "row" | "column"
@@ -239,23 +239,23 @@ export interface PublicQuizItem {
  *
  * The correctEvent is omitted from here because it's the correct answer and we don't want to show that to the students before they have solved the exercise. All available options can be found in `PublicQuizItem.timelineItemEvents`.
  * */
-export interface PublicTimelineItem {
+export interface OldPublicTimelineItem {
   id: string
   /** The year the student is supposed to match to an event. */
   year: string
 }
 
 /** @deprecated */
-export interface PublicTimelineEvent {
+export interface OldPublicTimelineEvent {
   id: string
   name: string
 }
 
 /** @deprecated */
-export type ModelSolutionQuizItem = Omit<QuizItem, "validityRegex">
+export type OldModelSolutionQuizItem = Omit<QuizItem, "validityRegex">
 
 /** @deprecated */
-export interface QuizItemOption {
+export interface OldQuizItemOption {
   id: string
   quizItemId?: string
   order: number
@@ -269,7 +269,7 @@ export interface QuizItemOption {
 }
 
 /** @deprecated */
-export interface NormalizedQuizItemOption {
+export interface OldNormalizedQuizItemOption {
   id: string
   quizItemId: string
   order: number
@@ -296,7 +296,7 @@ export interface NormalizedQuizItemOption {
 
 /** @deprecated
  *  Only defined for the timeline exercise type */
-export interface NormalizedQuizItemTimelineItem {
+export interface OldNormalizedQuizItemTimelineItem {
   id: string
   /** The year the student is supposed to match to an event. */
   year: string
@@ -307,15 +307,15 @@ export interface NormalizedQuizItemTimelineItem {
 }
 
 /** @deprecated */
-export type QuizItemTimelineItem = NormalizedQuizItemTimelineItem
+export type OldQuizItemTimelineItem = OldNormalizedQuizItemTimelineItem
 
 /** @deprecated */
-export interface QuizItemOptionVariables {
+export interface OldQuizItemOptionVariables {
   optionEditing: boolean
 }
 
 /** @deprecated */
-export interface PublicQuizItemOption {
+export interface OldPublicQuizItemOption {
   id: string
   quizItemId?: string
   order: number
@@ -324,17 +324,17 @@ export interface PublicQuizItemOption {
 }
 
 /** @deprecated */
-export interface QuizAnswer {
+export interface OldQuizAnswer {
   id: string
   createdAt: string
   updatedAt: string
   quizId: string
   status: "confirmed" | "open" | "locked"
-  itemAnswers: QuizItemAnswer[]
+  itemAnswers: OldQuizItemAnswer[]
 }
 
 /** @deprecated */
-export interface QuizItemAnswer {
+export interface OldQuizItemAnswer {
   id: string
   quizAnswerId: string
   quizItemId: string
@@ -349,11 +349,11 @@ export interface QuizItemAnswer {
   optionAnswers: string[] | null
   optionCells: string[][] | null
   /** Only used for timeline answers. */
-  timelineChoices: TimelineChoice[] | null
+  timelineChoices: OldTimelineChoice[] | null
 }
 
 /** @deprecated */
-export interface TimelineChoice {
+export interface OldTimelineChoice {
   /** We use timelineItem id to match for answers so that this is resilient to typo fixes in the year */
   timelineItemId: string
   /** We use a generated id to match the choices to options to make this resilient to typo fixes event name. */
@@ -361,7 +361,7 @@ export interface TimelineChoice {
 }
 
 /** @deprecated */
-export interface UserQuizState {
+export interface OldUserQuizState {
   userId: number
   quizId: string
   peerReviewsGiven: number
@@ -375,16 +375,16 @@ export interface UserQuizState {
 }
 
 /** @deprecated */
-export interface Entities {
-  quizzes: { [quizId: string]: NormalizedQuiz }
-  items: { [itemId: string]: NormalizedQuizItem }
-  options?: { [optionId: string]: NormalizedQuizItemOption }
-  timelineItems?: { [timelineItemId: string]: NormalizedQuizItemTimelineItem }
+export interface OldEntities {
+  quizzes: { [quizId: string]: OldNormalizedQuiz }
+  items: { [itemId: string]: OldNormalizedQuizItem }
+  options?: { [optionId: string]: OldNormalizedQuizItemOption }
+  timelineItems?: { [timelineItemId: string]: OldNormalizedQuizItemTimelineItem }
   result: string
 }
 
 /** @deprecated */
-export interface action {
+export interface OldAction {
   type: string
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   payload?: any
diff --git a/services/quizzes/types/quizTypes/modelSolutionSpec.ts b/services/quizzes/types/quizTypes/modelSolutionSpec.ts
index ca2e78498dc2..9136218e9a33 100644
--- a/services/quizzes/types/quizTypes/modelSolutionSpec.ts
+++ b/services/quizzes/types/quizTypes/modelSolutionSpec.ts
@@ -33,17 +33,6 @@ export type QuizItemType =
   | "choose-n"
   | "multiple-choice-dropdown"
 
-export type OldQuizItemType =
-  | "essay"
-  | "multiple-choice"
-  | "scale"
-  | "checkbox"
-  | "open"
-  | "matrix"
-  | "timeline"
-  | "clickable-multiple-choice"
-  | "multiple-choice-dropdown"
-
 export type multipleChoiceMultipleOptionsGradingPolicy =
   | "default"
   | "points-off-incorrect-options"
diff --git a/services/quizzes/types/quizTypes/oldQuizTypes.ts b/services/quizzes/types/quizTypes/oldQuizTypes.ts
index f106146c3e16..fc3f6ecbc24d 100644
--- a/services/quizzes/types/quizTypes/oldQuizTypes.ts
+++ b/services/quizzes/types/quizTypes/oldQuizTypes.ts
@@ -1,3 +1,4 @@
+/** @deprecated */
 export type OldQuizItemType =
   | "essay"
   | "multiple-choice"
diff --git a/services/quizzes/types/quizTypes/privateSpec.ts b/services/quizzes/types/quizTypes/privateSpec.ts
index 68b2fd5879b7..af3c89567f2e 100644
--- a/services/quizzes/types/quizTypes/privateSpec.ts
+++ b/services/quizzes/types/quizTypes/privateSpec.ts
@@ -33,17 +33,6 @@ export type QuizItemType =
   | "choose-n"
   | "multiple-choice-dropdown"
 
-export type OldQuizItemType =
-  | "essay"
-  | "multiple-choice"
-  | "scale"
-  | "checkbox"
-  | "open"
-  | "matrix"
-  | "timeline"
-  | "clickable-multiple-choice"
-  | "multiple-choice-dropdown"
-
 export type multipleChoiceMultipleOptionsGradingPolicy =
   | "default"
   | "points-off-incorrect-options"
diff --git a/shared-module/src/locales/en/cms.json b/shared-module/src/locales/en/cms.json
index 33a80d6b2d84..2ccfccb7de9a 100644
--- a/shared-module/src/locales/en/cms.json
+++ b/shared-module/src/locales/en/cms.json
@@ -22,6 +22,7 @@
   "chapters-grid-placeholder": "Chapters Grid Placeholder",
   "chapters-grid-placeholder-explanation": "This block is placed on the course material front page for navigating to different chapters easily.",
   "close": "Close",
+  "configure-review-answers-option": "Configure review answers option",
   "congratulations-explanation": "This block is placed in the course material where you wish to show the student congratulations when they have completed the course. For courses that have been configured for receiving ECTS, it will also provide a link to a page where they can register their completion to Open University.",
   "congratulations-placeholder": "Congratulations placeholder",
   "course-progress-placeholder": "Chapter progress placeholder",
diff --git a/shared-module/src/utils/constants.ts b/shared-module/src/utils/constants.ts
index 6c012d5c99f3..e9ed637e00b8 100644
--- a/shared-module/src/utils/constants.ts
+++ b/shared-module/src/utils/constants.ts
@@ -10,3 +10,4 @@ export const SHOW_TOAST_DURATION_IN_SYSTEM_TESTS_EVENT = "show-toas-duration-in-
 export const EXERCISE_SERVICE_CONTENT_ID = "exercise-service-content-id"
 export const LANGUAGE_COOKIE_KEY = "selected-language"
 export const SPINNER_CLASS = "loading-spinner-component"
+export const OUTDATED_BROWSER_WARNING_SCRIPT = `alert("Your browser is so old that it won't work with this page. We recommend switching to Firefox.");`